Push many files from Pootle

59 files changed, 5278 insertions, 16194 deletions

diff --git a/po/af.po b/po/af.po
index ded5b6f..1756ee3 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-06-20 18:58-0400\n"
 "Last-Translator: Morgan Collett <morgan.collett@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -433,23 +433,23 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Ontkoppel"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Koppel..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Gekoppel"
@@ -479,8 +479,8 @@ msgid "Please wait..."
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Koppel"
@@ -539,20 +539,20 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -903,26 +903,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Om jou veranderings te gebruik moet jy sugar herbegin.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Veranderings het herbegin nodig"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Kanselleer veranderings"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Later"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Herbegin nou"
 
@@ -1049,19 +1049,26 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Sleutel Tipe:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Geldigheidsverklaring Tipe:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr ""
 
@@ -1077,7 +1084,7 @@ msgstr "Aangaan"
 msgid "Join"
 msgstr "Aansluit"
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
diff --git a/po/am.po b/po/am.po
index 12a1b88..c52b32c 100644
--- a/po/am.po
+++ b/po/am.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2012-02-09 02:46+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -447,23 +447,23 @@ msgstr "የአይ ፒ አድራሻ ፡ %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "አቋርጠው"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "እየተገናኘ ነው..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "ተገናኝቷል"
@@ -493,8 +493,8 @@ msgid "Please wait..."
 msgstr ""
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "አገናኝ"
@@ -554,20 +554,20 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -918,26 +918,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "የተለወጡትን ነገሮች ለመመልከት ሹገርን እንደገና  ማስጀመር አለብዎት።\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "የተለወጡትን ነገሮች ለመመልከት እንደገና ማስጀመር ያስፈልጋል"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "የተለወጡትን ነገሮች አጥፋ"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "በኋላ"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "እንደገና አስጀምረዉ"
 
@@ -1064,19 +1064,26 @@ msgstr "የተመረጡት እይታ"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "የቁልፉ አይነት፡"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "የማረጋገጫ አይነት"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr ""
 
@@ -1092,7 +1099,7 @@ msgstr "ቀጥል"
 msgid "Join"
 msgstr "ተቀላቀል"
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 35ecb66..cf33390 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-08-24 08:00+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -67,48 +67,48 @@ msgstr "انقر لتغيير اللون:"
 msgid "About my Computer"
 msgstr "عن حاسوبي"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "غير مُتاح"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "المعرّف"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "الرقم التسلسلي:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "البرمجيات"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "البناء:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "سُكّر:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "البرمجيات المضمّنة:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "برمجية اللاسلكي المضمّنة:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "حقوق النشر والترخيص"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -119,7 +119,7 @@ msgstr ""
 "لرخصة جنو للتأميم عامّة الأغراض، ويمكنك تعديلها و/أو توزيع نسخ منها وفق شروط "
 "معينة مذكورة هنا."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "الترخيص كاملا:"
 
@@ -456,25 +456,25 @@ msgstr "رقم (عنوان) الإنترنت: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "يتصّل..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "مُتّصل"
 
@@ -503,9 +503,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "اتصل"
 
@@ -564,21 +564,21 @@ msgstr "راجع ضبط الرقم."
 msgid "Check your configuration."
 msgstr "راجع الإعدادات."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "شبكة عُروِيّة"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 #, python-format, python-format
 msgid "Mesh Network %s"
 msgstr "شبكة عُروِيّة %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "لا تتوفر أي اتصالات هاتف محمول."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "أنشي اتصالا من لوحة التحكم."
 
@@ -943,26 +943,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "تحتاج لإعادة تشغيل «سُكّر» لتُطبق التغييرات.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "تتطلب التغييرات إعادة التشغيل"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "ألغِ التغييرات"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "لاحقا"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "أعِد التشغيل الآن"
 
@@ -1001,7 +1001,7 @@ msgstr "احفظ"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "امسح"
@@ -1095,26 +1095,33 @@ msgstr "المنظور المفضل"
 msgid "<Ctrl>1"
 msgstr "‪<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "نوع المفتاح:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "نوع الاستيثاق:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA و WPA2 شخصي"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "أمن اللاسلكي:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "استكمل"
@@ -1124,12 +1131,12 @@ msgstr "استكمل"
 msgid "Join"
 msgstr "التحق"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "شبكة لا مركزية %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "شبكة عُروِيّة %d"
@@ -1303,81 +1310,81 @@ msgid "Tags:"
 msgstr "الوُسوم:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "الدفتر"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "ابحث"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "أي وقت"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "اليوم"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "منذ أمس"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "الأسبوع الماضي"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "الشهر الماضي"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "السنة الماضية"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "أي شخص"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "أصدقائي"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "صفي"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "أي شيء"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "انسخ إلى"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "استنسخ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "عطل أثناء نسخ المدخلة. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1385,24 +1392,24 @@ msgstr "عطل"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "ابدأ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "رتّب حسب تاريخ التعديل"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "رتّب حسب تاريخ الإنشاء"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "رتّب حسب الحجم"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "رتّب المنظور"
 
diff --git a/po/ay.po b/po/ay.po
deleted file mode 100644
index b0faf7d..0000000
--- a/po/ay.po
+++ /dev/null
@@ -1,1713 +0,0 @@
-# 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.0.1\n"
-
-#: ../extensions/cpsection/aboutme/__init__.py:24
-msgid "About Me"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:48
-msgid "You must enter a name."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:75
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:78
-#, python-format
-msgid "stroke:   %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:80
-#, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:82
-#, python-format
-msgid "fill:     %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:94
-msgid "Error in specified color modifiers."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:97
-msgid "Error in specified colors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:235
-msgid "Click to change your color:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/__init__.py:21
-msgid "About my Computer"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:42
-msgid "Not available"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:171
-#, python-format
-msgid "%(interface)s: %(version)s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:61
-msgid "Identity"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:70
-msgid "Serial Number:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:92
-msgid "Software"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:101
-msgid "Build:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:116
-msgid "Sugar:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:132
-msgid "Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:147
-msgid "Wireless Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:170
-msgid "Copyright and License"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:188
-msgid ""
-"Sugar is the graphical user interface that you are looking at. Sugar is free "
-"software, covered by the GNU General Public License, and you are welcome to "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:200
-msgid "Full license:"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/model.py:92
-msgid "Error timezone does not exist."
-msgstr ""
-
-#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
-msgid "Timezone"
-msgstr ""
-
-#: ../extensions/cpsection/frame/__init__.py:21
-msgid "Frame"
-msgstr ""
-
-#: ../extensions/cpsection/frame/model.py:41
-#: ../extensions/cpsection/frame/model.py:66
-msgid "Value must be an integer."
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:27
-msgid "never"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:28
-msgid "instantaneous"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:29
-#, python-format
-msgid "%s seconds"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:54
-msgid "Activation Delay"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:78
-msgid "Corner"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:113
-msgid "Edge"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:32
-msgid "Keyboard"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:190
-msgid "Keyboard Model"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:250
-msgid "Key(s) to change layout"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:319
-msgid "Keyboard Layout(s)"
-msgstr ""
-
-#: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:33
-msgid "Language"
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:30
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:129
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:152
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr ""
-
-#: ../extensions/cpsection/language/view.py:57
-msgid ""
-"Add languages in the order you prefer. If a translation is not available, "
-"the next in the list will be used."
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/__init__.py:21
-msgid "Modem Configuration"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:94
-msgid "Username:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:106
-msgid "Password:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:118
-msgid "Number:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:130
-msgid "Access Point Name (APN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:142
-msgid "Personal Identity Number (PIN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:154
-msgid "Personal Unblocking Key (PUK):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:175
-msgid ""
-"You will need to provide the following information to set up a mobile "
-"broadband connection to a cellular (3G) network."
-msgstr ""
-
-#: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:29
-msgid "Network"
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:71
-msgid "State is unknown."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:99
-msgid "Error in specified radio argument use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:140
-msgid "Error in specified argument use 0/1."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:61
-msgid "Wireless"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:69
-msgid "Turn off the wireless radio to save battery life"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:82
-msgid "Radio"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:98
-msgid "Discard network history if you have trouble connecting to the network"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:107
-msgid "Discard network history"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:122
-msgid "Collaboration"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:130
-msgid ""
-"The server is the equivalent of what room you are in; people on the same "
-"server will be able to see each other, even when they aren't on the same "
-"network."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:140
-msgid "Server:"
-msgstr ""
-
-#: ../extensions/cpsection/power/__init__.py:21
-msgid "Power"
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:90
-msgid "Error in automatic pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:120
-msgid "Error in extreme pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:48
-msgid "Power management"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:58
-msgid "Automatic power management (increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:86
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/updater/__init__.py:21
-msgid "Software update"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:63
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities, and "
-"provide new features."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:125
-#, python-format
-msgid "Checking %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:127
-#, python-format
-msgid "Downloading %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:129
-#, python-format
-msgid "Updating %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:139
-msgid "Your software is up-to-date"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:141
-#, python-format
-msgid "You can install %s update"
-msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:159
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:164
-msgid "Installing updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:173
-#, python-format
-msgid "%s update was installed"
-msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:255
-msgid "Install selected"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:276
-#, python-format
-msgid "Download size: %s"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:364
-#, python-format
-msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
-
-#. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:382
-msgid "None"
-msgstr ""
-
-#. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:385
-msgid "1 KB"
-msgstr ""
-
-#. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:388
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:391
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:71
-msgid "My Battery"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:147
-msgid "Removed"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:150
-msgid "Charging"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:153
-msgid "Very little power remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:158
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:161
-msgid "Charged"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:49
-#, python-format
-msgid "IP address: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:104
-#: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
-msgid "Disconnect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:112
-#: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
-msgid "Connecting..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:117
-#: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
-msgid "Connected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:130
-msgid "No wireless connection"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:144
-msgid "Channel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:159
-msgid "Wired Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:188
-msgid "Speed"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:213
-msgid "Wireless modem"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:281
-msgid "Please wait..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
-msgid "Connect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:287
-msgid "Disconnected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:294
-#: ../src/jarabe/controlpanel/toolbar.py:119
-#: ../src/jarabe/desktop/homebox.py:71
-#: ../src/jarabe/frame/activitiestray.py:602
-#: ../src/jarabe/frame/activitiestray.py:704
-#: ../src/jarabe/frame/activitiestray.py:732
-msgid "Cancel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:333
-msgid "Try connection again"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:336
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:340
-#, python-format
-msgid "Suggestion: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:349
-#, python-format
-msgid "Connected for %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:355
-#: ../extensions/deviceicon/network.py:356
-#, python-format
-msgid "%d KB"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:361
-msgid "Check your Pin/Puk configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:364
-msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:368
-msgid "Check the Number configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:370
-msgid "Check your configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:612
-msgid "Mesh Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:656
-#, python-format
-msgid "Mesh Network %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:779
-msgid "No GSM connection available."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:780
-msgid "Create a connection in the control panel."
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:61
-msgid "My Speakers"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:138
-msgid "Unmute"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:141
-msgid "Mute"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:38
-msgid "finger"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:39
-msgid "stylus"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:68
-msgid "My touchpad"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:59
-msgid "Mesh"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "Group"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "Home"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "Activity"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:72
-msgid "Screenshot"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:74
-#, python-format
-msgid "Screenshot of \"%s\""
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:1
-msgid ""
-"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
-"long name."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:2
-msgid "Additional directories which can contain updated translations."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:3
-msgid "Backup URL"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:4
-msgid "Bundle IDs of protected activities"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:5
-msgid ""
-"Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rgb colors. "
-"Example: #AC32FF,#9A5200"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:6
-msgid "Corner Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:7
-msgid "Default font face"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:8
-msgid "Default font size"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:9
-msgid "Default nick"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:10
-msgid "Delay for the activation of the frame using the corners."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:11
-msgid "Delay for the activation of the frame using the edges."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:12
-msgid "Directory to search for translations"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:13
-msgid "Edge Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:14
-msgid "Favorites Layout"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:15
-msgid "Favorites resume mode"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:16
-msgid "Font face that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:17
-msgid "Font size that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:18
-msgid "GSM network APN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:19
-msgid "GSM network PIN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:20
-msgid "GSM network PUK"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:21
-msgid "GSM network access point name configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:22
-msgid "GSM network number"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:23
-msgid "GSM network password"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:24
-msgid "GSM network password configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:25
-msgid "GSM network personal identification number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:26
-msgid "GSM network personal unlock key configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:27
-msgid "GSM network telephone number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:28
-msgid "GSM network username"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:29
-msgid "GSM network username configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:30
-msgid ""
-"If TRUE, Sugar will make us searchable for the other users of the Jabber "
-"server."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:31
-msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:32
-msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:33
-msgid ""
-"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
-"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
-"hoc network."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:34
-msgid "Jabber Server"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:35
-msgid "Keyboard layouts"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:36
-msgid "Keyboard model"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:37
-msgid "Keyboard options"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:38
-msgid "Layout of the favorites view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:39
-msgid ""
-"List of keyboard layouts. Each entry should be in the form layout(variant)"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:40
-msgid "List of keyboard options."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:41
-msgid "Power Automatic"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:42
-msgid "Power Automatic."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:43
-msgid "Power Extreme"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:44
-msgid "Power Extreme."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:45
-msgid "Publish to Gadget"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:46
-msgid "Setting for muting the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:47
-msgid "Show Log out"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:48
-msgid "Show Restart"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:49
-msgid "Show Sugar Ad-hoc networks"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:50
-msgid "Sound Muted"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:51
-msgid "The keyboard model to be used"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:53
-msgid "Timezone setting for the system."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:54
-msgid "Url of the jabber server to use."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:55
-msgid "Url where the backup is saved to."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:56
-msgid "User Color"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:57
-msgid "User Name"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:58
-msgid "User name that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:59
-msgid ""
-"Users will not be allowed to erase these activities through the list view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:60
-msgid "Volume Level"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:61
-msgid "Volume level for the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:62
-msgid ""
-"When in resume mode, clicking on a favorite icon will cause the last entry "
-"for that activity to be resumed."
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:28
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:30
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:31
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr ""
-
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:38
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:52
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
-#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
-#: ../src/jarabe/journal/volumestoolbar.py:307
-msgid "Warning"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:297
-#: ../src/jarabe/controlpanel/sectionview.py:41
-msgid "Changes require restart"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:300
-msgid "Cancel changes"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
-msgid "Later"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:309
-msgid "Restart now"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
-msgid "Done"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:125
-#: ../src/jarabe/desktop/favoritesview.py:347
-msgid "Ok"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format
-msgid "Version %s"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:356
-msgid "Confirm erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:358
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:362
-#: ../src/jarabe/frame/clipboardmenu.py:67
-#: ../src/jarabe/view/viewsource.py:280
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:365
-#: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
-#: ../src/jarabe/journal/palettes.py:126
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:435
-msgid "Remove favorite"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:439
-msgid "Make favorite"
-msgstr ""
-
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:127
-msgid "Freeform"
-msgstr ""
-
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:215
-msgid "Ring"
-msgstr ""
-
-#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:402
-msgid "Spiral"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:472
-msgid "Box"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:515
-msgid "Triangle"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:338
-msgid "Registration Failed"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:339
-#, python-format
-msgid "%s"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:341
-msgid "Registration Successful"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:342
-msgid "You are now registered with your school server."
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:641
-msgid "Register"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:643
-#: ../src/jarabe/desktop/favoritesview.py:660
-msgid "Register again"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:66
-msgid "Software Update"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-msgid "Check now"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:197
-msgid "List view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:198
-msgid "<Ctrl>2"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:253
-msgid "Favorites view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:254
-msgid "<Ctrl>1"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:143
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:163
-msgid "Authentication Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:229
-msgid "WPA & WPA2 Personal"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:238
-msgid "Wireless Security:"
-msgstr ""
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
-#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
-msgid "Resume"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:96
-#: ../src/jarabe/frame/activitiestray.py:182
-msgid "Join"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:500
-#, python-format
-msgid "Ad-hoc Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format
-msgid "Mesh Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:143
-msgid "Cannot connect to the server."
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:150
-msgid "The server could not complete the request."
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:187
-#: ../src/jarabe/frame/activitiestray.py:574
-msgid "Decline"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:523
-#, python-format
-msgid "%dB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:525
-#, python-format
-msgid "%dKB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:527
-#, python-format
-msgid "%dMB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:544
-#, python-format
-msgid "%s of %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:558
-#, python-format
-msgid "Transfer from %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:569
-msgid "Accept"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:592
-#: ../src/jarabe/frame/activitiestray.py:722
-#, python-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:626
-#: ../src/jarabe/frame/activitiestray.py:639
-#: ../src/jarabe/frame/activitiestray.py:757
-msgid "Dismiss"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:643
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:691
-#, python-format
-msgid "Transfer to %s"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:56
-msgctxt "Clipboard"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/frame/clipboardmenu.py:85
-msgid "Open"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:90
-msgid "Open with"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardobject.py:50
-#, python-format
-msgid "%s clipping"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "Neighborhood"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "F1"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "F2"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "F3"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "F4"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:90
-msgid "Name:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:126
-msgid "Click to change color:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
-msgid "Back"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:204
-msgid "Next"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:156
-#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
-#: ../src/jarabe/journal/volumestoolbar.py:130
-msgid "Untitled"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:245
-msgid "No preview"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#, python-format
-msgid "Kind: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#: ../src/jarabe/journal/listmodel.py:150
-#: ../src/jarabe/journal/listmodel.py:158
-msgid "Unknown"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:265
-#, python-format
-msgid "Date: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:266
-#, python-format
-msgid "Size: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:294
-#: ../src/jarabe/journal/misc.py:108
-msgid "No date"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:301
-msgid "Participants:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:323
-msgid "Description:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:348
-msgid "Tags:"
-msgstr ""
-
-#: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
-#: ../src/jarabe/journal/palettes.py:198
-#: ../src/jarabe/journal/volumestoolbar.py:368
-msgid "Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:71
-msgid "Search"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:138
-msgid "Anytime"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:140
-msgid "Today"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:142
-msgid "Since yesterday"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
-msgid "Past week"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
-msgid "Past month"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
-msgid "Past year"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:155
-msgid "Anyone"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:157
-msgid "My friends"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:158
-msgid "My class"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:300
-msgid "Anything"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:381
-#: ../src/jarabe/journal/palettes.py:93
-msgid "Copy to"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:389
-#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:422
-#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
-#: ../src/jarabe/journal/volumestoolbar.py:315
-#, python-format
-msgid "Error while copying the entry. %s"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:423
-#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
-#: ../src/jarabe/journal/volumestoolbar.py:316
-msgid "Error"
-msgstr ""
-
-#. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
-#: ../src/jarabe/journal/palettes.py:74
-msgid "Start"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:525
-msgid "Sort by date modified"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:526
-msgid "Sort by date created"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:527
-msgid "Sort by size"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:536
-msgid "Sort view"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:316
-msgid "Your Journal is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:319
-msgid "Your documents folder is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:321
-msgid "The device is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:323
-msgid "No matching entries"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:397
-msgid "Clear search"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:273
-#, python-format
-msgid "Older Version Of %s Activity"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:274
-#, python-format
-msgid "Do you want to downgrade to version %s"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:64
-msgid "Your Journal is full"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:68
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:80
-msgid "Show Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:146
-msgid "Choose an object"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:410
-msgid "Close"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:72
-msgid "Resume with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:75
-msgid "Start with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
-msgid "No activity to start entry"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:112
-msgid "Send to"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:121
-msgid "View Details"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:160
-msgid "Entries without a file cannot be sent."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
-#: ../src/jarabe/journal/volumestoolbar.py:306
-msgid "Entries without a file cannot be copied."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:267
-msgid "Clipboard"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:322
-msgid "No friends present"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:327
-msgid "No valid connection found"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:355
-msgid "No activity to resume entry"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:209
-msgid "Documents"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:391
-#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:163
-msgid "The reason for the device state change is unknown."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:165
-msgid "The state change is normal."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:167
-msgid "The device is now managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:169
-msgid "The device is no longer managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:171
-msgid "The device could not be readied for configuration."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:173
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:176
-msgid "The IP configuration is no longer valid."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:178
-msgid "Secrets were required, but not provided."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:180
-msgid ""
-"The 802.1X supplicant disconnected from the access point or authentication "
-"server."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:183
-msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:185
-msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:187
-msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:189
-msgid "The PPP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:191
-msgid "The PPP service disconnected unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:193
-msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:195
-msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:197
-msgid "The DHCP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:199
-msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:201
-msgid "The shared connection service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:203
-msgid "The shared connection service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:206
-msgid "The AutoIP service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:208
-msgid "The AutoIP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:210
-msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:212
-msgid "Dialing failed because the line was busy."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:214
-msgid "Dialing failed because there was no dial tone."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:216
-msgid "Dialing failed because there was no carrier."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:218
-msgid "Dialing timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:220
-msgid "Dialing failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:222
-msgid "Modem initialization failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:224
-msgid "Failed to select the specified GSM APN"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:226
-msgid "Not searching for networks."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:228
-msgid "Network registration was denied."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:230
-msgid "Network registration timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:232
-msgid "Failed to register with the requested GSM network."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:234
-msgid "PIN check failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:236
-msgid "Necessary firmware for the device may be missing."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:238
-msgid "The device was removed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:240
-msgid "NetworkManager went to sleep."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:242
-msgid "The device's active connection was removed or disappeared."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:245
-msgid "A user or client requested the disconnection."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:247
-msgid "The device's carrier/link changed."
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:67
-msgid "Remove friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:70
-msgid "Make friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:87
-msgid "Shutdown"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:95
-msgid "Restart"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:101
-msgid "Logout"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:106
-msgid "My Settings"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:142
-#, python-format
-msgid "Invite to %s"
-msgstr ""
-
-#: ../src/jarabe/view/launcher.py:145
-#, python-format
-msgid "<b>%s</b> failed to start."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:48
-msgid "Starting..."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:58
-msgid "Activity failed to start"
-msgstr ""
-
-#. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:91
-msgid "View Source"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:102
-msgid "Stop"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:139
-msgid "Start new"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:180
-msgid "Show contents"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:229
-msgctxt "Volume"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:263
-msgid "Instance Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:312
-msgid "Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:374
-msgid "Activity Bundle Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:393
-msgid "Sugar Toolkit Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
-#, python-format
-msgid "View source: %r"
-msgstr ""
-
-#: ../src/jarabe/util/emulator.py:40
-msgid "Sugar in a window"
-msgstr ""
diff --git a/po/aym.po b/po/aym.po
index 5033a2d..da29408 100644
--- a/po/aym.po
+++ b/po/aym.po
@@ -1,14 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#  SOME DESCRIPTIVE TITLE.
+#  Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+#  This file is distributed under the same license as the PACKAGE package.
+#  FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
-"PO-Revision-Date: 2011-11-24 05:24+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2011-12-02 23:46+0200\n"
+"Last-Translator: JonyR <jony_aymara@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: aym\n"
 "MIME-Version: 1.0\n"
@@ -122,6 +122,10 @@ msgstr "Red inalámbrica wakisiri Firmware:"
 msgid "Copyright and License"
 msgstr "Wakichirina wakisiripa"
 
+#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
+#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
+#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
+#  "se describen en ella."
 #: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
@@ -174,6 +178,7 @@ msgstr "janipuniwa"
 msgid "instantaneous"
 msgstr "mäpita"
 
+#  "%s segundos"
 #: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
@@ -210,6 +215,7 @@ msgstr "Kasta qillqaña"
 msgid "Key(s) to change layout"
 msgstr "Wakichatanaka mayjt'ayaña q'upt'aña"
 
+#  "Diseño(s) de teclado"
 #: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr "Qillqaña yänaka"
@@ -220,20 +226,25 @@ msgstr "Qillqaña yänaka"
 msgid "Language"
 msgstr "Aru"
 
+#  "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "Janiwa wakisiti ~/.i18n. Taqina mantañapataki wakichata."
 
+#  "El lenguaje del código=%s no pudo ser determinado."
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "código=%s aruxa janiwa amuyasiti."
 
+#  "Lo siento, yo no hablo '%s'."
 #: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Jichhasti, janiwa yatkti '%s'."
 
+#  "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
+#  "disponible, se usará la siguiente en la lista."
 #: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
@@ -242,34 +253,43 @@ msgstr ""
 "Arunaka wakisipanjama siqintma. Aru chanipa jani utjipana, siqina arkiri "
 "aruwa chhijllasini."
 
+#  "Configuración del módem"
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
 msgid "Modem Configuration"
 msgstr "módem wakichäwi wakichaña"
 
+#  "Nombre de usuario:"
 #: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
 msgstr "Apnaqirini sutipa:"
 
+#  "Contraseña:"
 #: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
 msgstr "Jist'araña:"
 
+#  "Número:"
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
 msgstr "Jakhu:"
 
+#  "Nombre de punto de acceso (APN):"
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
 msgstr "Qhantayaña chiqana sutipa (APN):"
 
+#  "Número de identificación personal (PIN):"
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
 msgstr "Sapa mayni chimpupa jakhu (PIN):"
 
+#  "Clave personal de desbloqueo (PUK):"
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
 msgstr "Qhantayaña sayt'ayata jist'araña (PUK):"
 
+#  "Necesitará proveer la información siguiente para configurar una conexión de "
+#  "banda ancha (3G) de red de telefonía celular."
 #: ../extensions/cpsection/modemconfiguration/view.py:175
 msgid ""
 "You will need to provide the following information to set up a mobile "
@@ -278,47 +298,59 @@ msgstr ""
 "(3G) telefonía celular wakichäwinakaparu mantañatakixa akïri yatiyañanakawa "
 "wakisi."
 
+#  "Red"
 #: ../extensions/cpsection/network/__init__.py:21
 #: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr "Mayachasïwi"
 
+#  "Estado desconocido."
 #: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr "Jani yatita kankaña."
 
+#  "Error en argumento especificado de radio use on/off."
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr "Pantjatawa, rayru qhantayañatakixa akïri limt'ma on/off."
 
+#  "Error en argumento especificado use 0/1."
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr "Panjatawa, wakisiriru katusa limt'ma 0/1."
 
+#  "Inalámbrica"
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr "Wayra taypita"
 
+#  "Apague la radio inalámbrica y ahorre vida de batería"
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr "Wayra raryu jiwasa qhanayaña jakañapa ch'amanchañataki"
 
+#  "Radio"
 #: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr "Raryu"
 
+#  "Descarte el historial de la red si tiene problemas de conexión"
 #: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr "Pantjata mistupana, mayachasïwi sartäwinaka amuyañäni"
 
+#  "Descarte historial de la red"
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr "Mayachasiña saräwinaka qhananchma"
 
+#  "Colaboración"
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr "Yanapaña"
 
+#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
+#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
 #: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
@@ -328,39 +360,50 @@ msgstr ""
 "Katuqirixa mayachasiña irptiri utankiwa; ukana taqina mayachasisa "
 "yanapasipxi, qawata mayaru tukupxi."
 
+#  "Servidor:"
 #: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr "Katuqiri:"
 
+#  "Energía"
 #: ../extensions/cpsection/power/__init__.py:21
 msgid "Power"
 msgstr "Ch'ama"
 
+#  "Error en argumento automático de manejo de energía, use on/off."
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr "Pantjata automatic pm amuyt'awipa janiwa/jisa."
 
+#  "Error en argumento extremo de manejo de energía, use on/off."
 #: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr "Pantjata extreme pm amuyt'awipa janiwa/jisa."
 
+#  "Manejo de energía"
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr "ch'amana apnaqawipa"
 
+#  "Manejo automático de energía (incrementa la vida de la batería)"
 #: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr "kipqaki ch'ama apnaqawipa (batteria jaya jaqañataqi)"
 
+#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
+#  "duración de la batería)"
 #: ../extensions/cpsection/power/view.py:86
 msgid ""
 "Extreme power management (disables wireless radio, increases battery life)"
 msgstr "Wali ch'ama apnaqawipa (radio apaqaña, batteria jaya jaqaña)"
 
+#  "Actualización de software"
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
 msgstr "amuyt'awi machaqaptayana"
 
+#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
+#  "de seguridad y proveen nuevas características."
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
@@ -369,47 +412,61 @@ msgstr ""
 "amuyt'awi machaqaptayañanaka pantjatanaka askichaña, pantjatanaka jarqayaña, "
 "machaq amuyt'awinaka."
 
+#  "Probando %s..."
 #: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr "Yant'aski %s..."
 
+#  "Descargando %s..."
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr "q'ipiraski %s..."
 
+#  "Actualizando %s..."
 #: ../extensions/cpsection/updater/view.py:129
+#, python-format
 #, python-format, fuzzy
 msgid "Updating %s..."
 msgstr "mayampi qalltayaski %s..."
 
+#  "Tu software esta actualizado"
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr "amuyt'awimaxa machaqaptayatawa"
 
+#  msgstr[0] "Puedes instalar %s actualización"
+#  msgstr[1] "Puedes instalar %s actualizaciones"
 #: ../extensions/cpsection/updater/view.py:141
+#, python-format
 #, python-format, fuzzy
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "uchantaña qalltasmawa machaqachaña"
 msgstr[1] "uchantaña qalltasmawa machaqachañanaka"
 
+#  "Buscando actualizaciones..."
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr "machaqaptayañanaka thaqaski..."
 
+#  "Instalando actualizaciones..."
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr "machaqaptayaña ut'ayaski..."
 
+#  msgstr[0] "%s actualización fue instalada"
+#  msgstr[1] "%s actualizaciones fueron instaladas"
 #: ../extensions/cpsection/updater/view.py:173
+#, python-format
 #, python-format, fuzzy
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] "%s machaqatawi uchatawxiwa"
 msgstr[1] "%s machaqatawinakaxa uchatawxiwa"
 
+#  "Instalación seleccionada"
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr "machaqaptayaña ajllitaxiwa"
@@ -424,45 +481,55 @@ msgstr ""
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
+#  "Ninguno"
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
 msgid "None"
 msgstr "ni maya"
 
+#  "1 KB"
 #. TRANS: download size of very small updates
 #: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
-msgstr "maya kb"
+msgstr "maya KB"
 
+#  "%.0f KB"
 #. TRANS: download size of small updates, e.g. '250 KB'
 #: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
-msgstr "%.0f kb"
+msgstr "%.0f KB"
 
+#  "%.1f MB"
 #. TRANS: download size of updates, e.g. '2.3 MB'
 #: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
-msgstr "%.1f mb"
+msgstr "%.1f MB"
 
+#  "Mi batería"
 #: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "nayana watiriyaja"
 
+#  "Eliminado"
 #: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr "apsuta"
 
+#  "Cargando"
 #: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr "Ch'ama uchaskiwa"
 
+#  "Queda muy poca batería"
 #: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr "pisi ch'amanikxiwa watiriyaxa"
 
+#  "Quedan %(hour)d:%(min).2d"
 #: ../extensions/deviceicon/battery.py:158
+#, python-format
 #, python-format, fuzzy
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "%(hour)d:%(min).2d jilt'iri"
@@ -472,46 +539,54 @@ msgstr "%(hour)d:%(min).2d jilt'iri"
 msgid "Charged"
 msgstr "q'ipxaruta"
 
+#  "Direccion IP: %s"
 #: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr "thaki katjawi IP: %s"
 
+#  "Desconectar"
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "jaljtayaña"
 
+#  "Conectando..."
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Mayachasa..."
 
+#  "Conectado"
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Mayachata"
 
+#  "No hay conexión inalámbrica"
 #: ../extensions/deviceicon/network.py:130
 msgid "No wireless connection"
 msgstr "Jani mayachaña utjiti"
 
+#  "Canal"
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "thaki"
 
+#  "Red Cableada"
 #: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr "Chinu taypit mayachasiña"
 
+#  "Velocidad"
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr "Ratuki"
@@ -524,17 +599,21 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
+#  "Conectar"
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Mayachaña"
 
+#  "Desconectado"
 #: ../extensions/deviceicon/network.py:287
+#, fuzzy
 msgid "Disconnected"
-msgstr ""
+msgstr "jaljtayaña"
 
+#  "Cancelar"
 #: ../extensions/deviceicon/network.py:294
 #: ../src/jarabe/controlpanel/toolbar.py:119
 #: ../src/jarabe/desktop/homebox.py:71
@@ -548,6 +627,7 @@ msgstr "Tukuyaña"
 msgid "Try connection again"
 msgstr ""
 
+#  "Error: %s"
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
@@ -563,6 +643,7 @@ msgstr ""
 msgid "Connected for %s"
 msgstr ""
 
+#  "%d KB"
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
 #, python-format
@@ -585,20 +666,20 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -610,6 +691,7 @@ msgstr ""
 msgid "Unmute"
 msgstr ""
 
+#  "Silenciar"
 #: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr "Amukt'ayaña"
@@ -707,6 +789,7 @@ msgstr ""
 msgid "Directory to search for translations"
 msgstr ""
 
+#  "Retraso del Borde"
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr "Qawaya Qhipt'awi"
@@ -800,11 +883,14 @@ msgstr ""
 msgid "Jabber Server"
 msgstr ""
 
+#  "Distribuciones del teclado"
 #: ../data/sugar.schemas.in.h:35
+#, fuzzy
 msgid "Keyboard layouts"
-msgstr ""
+msgstr "Qillqaña yänaka"
 
-# "Modelo de teclado"
+#  "Modelo del teclado"
+#  "Modelo de teclado"
 #: ../data/sugar.schemas.in.h:36
 #, fuzzy
 msgid "Keyboard model"
@@ -951,32 +1037,34 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
+#  "Hecho"
 #: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+#, fuzzy
 msgid "Done"
-msgstr ""
+msgstr "ni maya"
 
 #: ../src/jarabe/controlpanel/toolbar.py:125
 #: ../src/jarabe/desktop/favoritesview.py:347
@@ -1039,6 +1127,7 @@ msgstr ""
 msgid "Box"
 msgstr ""
 
+#  "Triángulo"
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
@@ -1048,6 +1137,7 @@ msgstr "Kimsa k'uchu"
 msgid "Registration Failed"
 msgstr ""
 
+#  "%s"
 #: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
@@ -1070,9 +1160,11 @@ msgstr ""
 msgid "Register again"
 msgstr ""
 
+#  "Actualización de Software"
 #: ../src/jarabe/desktop/homebox.py:66
+#, fuzzy
 msgid "Software Update"
-msgstr ""
+msgstr "amuyt'awi machaqaptayana"
 
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
@@ -1086,6 +1178,7 @@ msgstr ""
 msgid "List view"
 msgstr ""
 
+#  "<Ctrl>2"
 #: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
@@ -1094,26 +1187,35 @@ msgstr "<Ctrl>2"
 msgid "Favorites view"
 msgstr ""
 
+#  "<Ctrl>1"
 #: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr ""
 
+#  "Retomar"
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
 #: ../src/jarabe/journal/journaltoolbox.py:509
@@ -1126,7 +1228,7 @@ msgstr "Jutiri"
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
@@ -1149,16 +1251,19 @@ msgstr ""
 msgid "Decline"
 msgstr ""
 
+#  "%dB"
 #: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr "%dB"
 
+#  "%dKB"
 #: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr "%dKB"
 
+#  "%dMB"
 #: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
@@ -1178,6 +1283,7 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#  "%s (%s)"
 #: ../src/jarabe/frame/activitiestray.py:592
 #: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
@@ -1199,11 +1305,15 @@ msgstr ""
 msgid "Transfer to %s"
 msgstr ""
 
+# "Eliminar"
+#  SYNTAX ERROR: msgctxt "Clipboard"
 #: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
 msgstr "Chhaqtayaña"
 
+#  "Abrir"
 #: ../src/jarabe/frame/clipboardmenu.py:62
 #: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
@@ -1218,22 +1328,27 @@ msgstr ""
 msgid "%s clipping"
 msgstr ""
 
+#  "Vecindario"
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr "Wakisirinaka"
 
+#  "F1"
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr "F1"
 
+#  "F2"
 #: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr "F2"
 
+#  "F3"
 #: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr "F3"
 
+#  "F4"
 #: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr "F4"
@@ -1243,7 +1358,8 @@ msgstr "F4"
 msgid "Name:"
 msgstr "Suti:"
 
-# "Clic para cambiar su color:"
+#  "Clic para cambiar de color:"
+#  "Clic para cambiar su color:"
 #: ../src/jarabe/intro/window.py:126
 #, fuzzy
 msgid "Click to change color:"
@@ -1253,6 +1369,7 @@ msgstr "Samichata mayjt'ayañataki q'upt'ma:"
 msgid "Back"
 msgstr ""
 
+#  "Siguiente"
 #: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr "Jutiri"
@@ -1272,17 +1389,20 @@ msgstr ""
 msgid "Kind: %s"
 msgstr ""
 
+#  "Desconocido"
 #: ../src/jarabe/journal/expandedentry.py:264
 #: ../src/jarabe/journal/listmodel.py:150
 #: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr "Jani uñt'ata"
 
+#  "Fecha: %s"
 #: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
 msgstr "Uru chimpu: %s"
 
+#  "Tamaño: %s"
 #: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
@@ -1305,6 +1425,7 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
+#  "Diario"
 #: ../src/jarabe/journal/journalactivity.py:115
 #: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
@@ -1364,6 +1485,7 @@ msgstr ""
 msgid "Copy to"
 msgstr ""
 
+#  "Duplicar"
 #: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
@@ -1376,12 +1498,14 @@ msgstr "Payaptayaña"
 msgid "Error while copying the entry. %s"
 msgstr ""
 
+#  "Error"
 #: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr "Pantjata"
 
+#  "Iniciar"
 #. TRANS: Action label for starting an entry.
 #: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
@@ -1450,6 +1574,7 @@ msgstr ""
 msgid "Choose an object"
 msgstr ""
 
+#  "Cerrar"
 #: ../src/jarabe/journal/objectchooser.py:151
 #: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
@@ -1484,6 +1609,7 @@ msgstr ""
 msgid "Entries without a file cannot be copied."
 msgstr ""
 
+#  "Portapapeles"
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
 msgstr "Laphi k'ipi"
@@ -1689,6 +1815,7 @@ msgstr ""
 msgid "Shutdown"
 msgstr ""
 
+#  "Reiniciar"
 #: ../src/jarabe/view/buddymenu.py:95
 msgid "Restart"
 msgstr "Wasitata qalltaña"
@@ -1724,6 +1851,7 @@ msgstr ""
 msgid "View Source"
 msgstr ""
 
+#  "Parar"
 #: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr "Sayt'ayaña"
@@ -1736,7 +1864,10 @@ msgstr ""
 msgid "Show contents"
 msgstr ""
 
+# "Eliminar"
+#  SYNTAX ERROR: msgctxt "Clipboard"
 #: ../src/jarabe/view/palettes.py:229
+#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
 msgstr "Chhaqtayaña"
@@ -1745,6 +1876,7 @@ msgstr "Chhaqtayaña"
 msgid "Instance Source"
 msgstr ""
 
+#  "Fuente"
 #: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr "Naktayiri"
@@ -1762,6 +1894,7 @@ msgstr ""
 msgid "View source: %r"
 msgstr ""
 
+#  "Sugar en una ventana"
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
 msgstr "Mis'ki wakichawi"
diff --git a/po/bg.po b/po/bg.po
index 7ac2211..55f1dbe 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-03-01 13:14-0500\n"
 "Last-Translator: Alexander Todorov <atodorov@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,48 +60,48 @@ msgstr "Натиснете, за да смените цвета:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Не е наличен"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -109,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -143,6 +143,7 @@ msgid "instantaneous"
 msgstr ""
 
 #: ../extensions/cpsection/frame/view.py:29
+#, python-format
 #, python-format, fuzzy
 msgid "%s seconds"
 msgstr "%d секунди"
@@ -435,25 +436,25 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 #, fuzzy
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -482,9 +483,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -542,20 +543,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Mesh мрежа"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "Mesh мрежа"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -916,26 +918,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Моля, рестартирайте графичната среда, за да влязат в сила промените.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -970,7 +972,7 @@ msgstr "Запазване"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1062,25 +1064,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Тип ключ:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Тип удостоверяване:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Продължаване"
@@ -1090,12 +1099,13 @@ msgstr "Продължаване"
 msgid "Join"
 msgstr "Присъединяване"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "Mesh мрежа"
@@ -1269,101 +1279,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/bn.po b/po/bn.po
index 2c97f2b..62c9715 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Update 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: 2011-09-28 18:22+0200\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-01-12 07:59+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Bengali <core@bengalinux.org>\n"
 "Language: bn\n"
@@ -61,48 +61,48 @@ msgstr "রং পরিবর্তন করতে ক্লিক করু�
 msgid "About my Computer"
 msgstr "আমার কম্পিউটার সম্পর্কে"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "পাওয়া যায় নি"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "পরিচয়"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "ক্রমিক সংখ্যা:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "সফটওয়্যার"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "তৈরী করো:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "সুগার:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "ফার্মওয়্যার:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "তারবিহীন ফার্মওয়্যার:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "কপিরাইট এবং লাইসেন্স"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -114,7 +114,7 @@ msgstr ""
 "সাপেক্ষে আপনি এটি নিজের প্রয়োজনমতো পরিবর্তন করতে বা এর অনুলিপি বিতরন করতে "
 "পারবেন।"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "সম্পূর্ণ লাইসেন্স:"
 
@@ -445,8 +445,8 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "সংযোগ বিচ্ছিন্ন করুন"
 
@@ -456,17 +456,17 @@ msgstr "সংযোগ বিচ্ছিন্ন করুন"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "সংযোগ স্থাপিত হয়েছে"
 
@@ -495,9 +495,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "সংযুক্ত করুন"
 
@@ -555,21 +555,21 @@ msgstr "নাম্বার কনফিগারেশন পরীক্ষ�
 msgid "Check your configuration."
 msgstr "আপনার কনফিগারেশন পরীক্ষা করুন।"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "মেশ নেটওয়ার্ক"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 #, python-format,
 msgid "Mesh Network %s"
 msgstr "মেশ নেটওয়ার্ক %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "কোন GSM সংযোগ পাওয়া যায়নি।"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "কন্ট্রোল প্যানেলে একটি সংযোগ তৈরি করুন।"
 
@@ -801,7 +801,7 @@ 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."
@@ -857,11 +857,11 @@ msgstr "সিস্টেমের জন্য সময়অঞ্চলের
 
 #: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
-msgstr "jabber সার্ভার ব্যবহারের জন্য Url।"
+msgstr "jabber সার্ভার ব্যবহারের জন্য URL।"
 
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
-msgstr "ব্যাকআপ সংরক্ষণ করার জন্য Url."
+msgstr "ব্যাকআপ সংরক্ষণ করার জন্য URL।"
 
 #: ../data/sugar.schemas.in.h:56
 msgid "User Color"
@@ -933,39 +933,38 @@ msgstr ""
 "ব্যবহারবিধি: সুগার-কন্ট্রোল-প্যানেল [অপশন] কী [আরগুমেন্ট ...]\n"
 "    সুগার পরিবেশের কন্ট্রোল। \n"
 "    অপশন: \n"
-"    -h           সহায়তা বর্তা প্রদদর্শন করে এবং প্রস্থান করে\n"
-"    -l           বিদ্যমান সকল অপশন তালিকা বদ্ধ করে\n"
+"    -h           সহায়তা বর্তা প্রদদর্শন করে এবং প্রস্থান করে \n"
+"    -l           বিদ্যমান সকল অপশন তালিকা বদ্ধ করে \n"
 "    -h কী       কী সম্পর্কে তথ্য প্রদর্শন করে \n"
-"    -g কী       কী এর বর্তমান মান পাওয়া যায়\n"
-"    -s কী       কী এর বর্তমান মান নির্ধারণ করে \n"
-"    -c কী       কী এর বর্তমান মান মুছে ফেলে\n"
-" \n"
+"    -g কী       কী এর বর্তমান মান পাওয়া যায় \n"
+"    -s কী       কী এর বর্তমান মান নির্ধারণ করে  \n"
+"    -c কী       কী এর বর্তমান মান মুছে ফেলে \n"
 "    "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "তোমার পরিবর্তন কার্যকর করার জন্য সুগার পুনরায় চালু করতে হবে।\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "পরিবর্তন করা হলে 'পুনরায় চালুকরণ' প্রয়োজন"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "পরিবর্তন বাতিল করো"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "পরবর্তীতে"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "এখনই পুনরায় চালু করো"
 
@@ -1000,7 +999,7 @@ msgstr "রাখো"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "মোছো"
@@ -1093,25 +1092,32 @@ msgstr "পছন্দনীয় ভিউ"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "কী ধরণ:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "পরিচয় প্রমানের ধরণ:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ব্যক্তিগত"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "পুনরায় শুরু করুন"
@@ -1121,12 +1127,12 @@ msgstr "পুনরায় শুরু করুন"
 msgid "Join"
 msgstr "যোগ দাও"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "অ্যাড-হক নেটওয়ার্ক %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 #, python-format,
 msgid "Mesh Network %d"
@@ -1300,81 +1306,81 @@ msgid "Tags:"
 msgstr "ট্যাগ:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "জার্নাল"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "অনুসন্ধান"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "যে কোন সময়"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "আজ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "গতকাল পর্যন্ত"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "পূর্ব সপ্তাহ"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "পূর্ব মাস"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "পূর্ব বছর"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "যে কেউ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "আমার বন্ধুরা"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "আমার ক্লাস"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "যে কোন কিছু"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "এন্ট্রি অনুলিপি করার সময় ত্রুটি। %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1382,24 +1388,24 @@ msgstr "ত্রুটি"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "আরম্ভ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "পরিবর্ধনের তারিখ অনুযায়ী সাজানো"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "তৈরি করা তারিখ অনুযায়ী সাজানো"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "আকার অনুযায়ী সাজানো"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "প্রদর্শন ক্রমানুসারে সাজানো"
 
@@ -1550,7 +1556,7 @@ msgid ""
 "The 802.1X supplicant disconnected from the access point or authentication "
 "server."
 msgstr ""
-"802.1X  সাপ্লিকেন্ট প্রবেশাধিকার পয়েন্ট বা প্রমাণীকরণ সার্ভার থেকে বিছিন্ন।"
+"802.1X সাপ্লিকেন্ট প্রবেশাধিকার পয়েন্ট বা প্রমাণীকরণ সার্ভার থেকে বিছিন্ন।"
 
 #: ../src/jarabe/model/network.py:183
 msgid "Configuration of the 802.1X supplicant failed."
@@ -1602,7 +1608,7 @@ msgstr "AutoIP সার্ভিস শুরু করতে ব্যর্�
 
 #: ../src/jarabe/model/network.py:208
 msgid "The AutoIP service reported an unexpected error."
-msgstr "AutoIP সার্ভিস  ত্রুটি অপ্রত্যাশিত ত্রুটি রিপোর্ট করেছে।"
+msgstr "AutoIP সার্ভিস ত্রুটি অপ্রত্যাশিত ত্রুটি রিপোর্ট করেছে।"
 
 #: ../src/jarabe/model/network.py:210
 msgid "The AutoIP service quit or failed unexpectedly."
@@ -1678,7 +1684,7 @@ msgstr "ব্যবহারকারী বা ক্লায়েন্ট স
 
 #: ../src/jarabe/model/network.py:247
 msgid "The device's carrier/link changed."
-msgstr "The device's carrier/link changed."
+msgstr ""
 
 #: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
diff --git a/po/ca.po b/po/ca.po
index cda40cb..9606842 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-01-14 17:19+0000\n"
 "Last-Translator: Jaume <jaume@nualart.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,48 +61,48 @@ msgstr "Clic per a canviar de color:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "No disponible"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -110,7 +110,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -144,6 +144,7 @@ msgid "instantaneous"
 msgstr ""
 
 #: ../extensions/cpsection/frame/view.py:29
+#, python-format
 #, python-format, fuzzy
 msgid "%s seconds"
 msgstr "%d segons"
@@ -443,25 +444,25 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 #, fuzzy
 msgid "Disconnect"
 msgstr "Desconnectat"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -490,9 +491,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -551,23 +552,23 @@ msgid "Check your configuration."
 msgstr ""
 
 # Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 #, fuzzy
 msgid "Mesh Network"
 msgstr "Xarxa Mesh"
 
 # Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 #, fuzzy
 msgid "Mesh Network %s"
 msgstr "Xarxa Mesh"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -918,26 +919,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Per aplicar els canvis, cal que reiniciar el sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -972,7 +973,7 @@ msgstr ""
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1064,25 +1065,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tipus de clau:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tipus d'autentificació:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Reprendre"
@@ -1093,13 +1101,13 @@ msgstr "Reprendre"
 msgid "Join"
 msgstr "Uneix-t'hi"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
 # Aquí he agafat l'original "mesh", en comptes de fer-ne una traducció
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 #, fuzzy
 msgid "Mesh Network %d"
@@ -1274,101 +1282,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 1a75e53..551e0cb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-09-24 19:13+0200\n"
 "Last-Translator: Aputsiaq Niels <aj@isit.gl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,48 +73,48 @@ msgstr "Klik for at ændre din farve:"
 msgid "About my Computer"
 msgstr "Om min computer"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Ikke tilgængelig"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identificér"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Serienummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Bygget:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Trådløs firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Ophavsret og licens"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -125,7 +125,7 @@ msgstr ""
 "dækket af GNU General Public License, og du er velkommen til at ændre den "
 "og/eller distribuere kopier af den under visse betingelser beskrevet deri."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Fuld licens:"
 
@@ -456,24 +456,24 @@ msgstr "IP-adresse: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Afbryd"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Forbinder..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Tilsluttet"
 
@@ -502,9 +502,9 @@ msgid "Please wait..."
 msgstr "Vent venligst..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Forbind"
 
@@ -562,20 +562,20 @@ msgstr "Tjek konfiguration af nummeret."
 msgid "Check your configuration."
 msgstr "Tjek din konfiguration."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Maskenetværk"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Maskenetværk %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Ingen tilgængelig GSM-forbindelse."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Opret en forbindelse i kontrolpanelet."
 
@@ -953,26 +953,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "For at dine ændringer træder i kraft skal du genstarte sukker.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Ændringer kræver genstart"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Fortryd ændringer"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Senere"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Genstart nu"
 
@@ -1007,7 +1007,7 @@ msgstr "Behold"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Slet"
@@ -1100,25 +1100,32 @@ msgstr "Favoritvisning"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Nøgletype:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Ægthedstype:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Trådløs sikkerhed:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Genoptag"
@@ -1128,12 +1135,12 @@ msgstr "Genoptag"
 msgid "Join"
 msgstr "Tilslut"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Ad-hoc netværk %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Maskenetværk %d"
@@ -1307,101 +1314,101 @@ msgid "Tags:"
 msgstr "Mærkater:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Logbog"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Søg"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Nårsomhelst"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Idag"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Siden igår"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Seneste uge"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Seneste måned"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Seneste år"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Enhver"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Mine venner"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Min klasse"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Hvadsomhelst"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Kopier til"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Duplikér"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Fejl under kopiering af posten. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr "Fejl"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Start"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Sortér efter ændringsdato"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Sortér efter oprettelsesdato"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Sortér efter størrelse"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "Sorteringsvisning"
 
diff --git a/po/de.po b/po/de.po
index 451c647..f2d664a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-09-26 22:07+0200\n"
 "Last-Translator: Markus <m.slg@gmx.de>\n"
 "Language-Team: German <fedora-trans-de@redhat.com>\n"
@@ -104,48 +104,48 @@ msgstr "Klicken, um deine Farbe zu wechseln:"
 msgid "About my Computer"
 msgstr "Über meinen Computer"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identität"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Seriennummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Version:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "WLAN-Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Copyright und Lizenz"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -157,7 +157,7 @@ msgstr ""
 "darin festgelegten Bedingungen ist es erlaubt, die Software zu verändern "
 "und/oder Kopien davon zu erstellen und zu verteilen."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Vollständige Lizenz:"
 
@@ -501,8 +501,8 @@ msgstr "IP-Addresse: %s"
 # (mschlager) war 'Nicht verbunden', ich würde aber eher erwarten, dass das die Beschriftung eines Menüeintrags ist, mit dem man eine Verbindung trennt, was dann in der Folge die Meldung 'Disconnecting...' liefert.
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
@@ -512,18 +512,18 @@ msgstr "Verbindung trennen"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Verbinde..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Verbunden"
 
@@ -553,9 +553,9 @@ msgid "Please wait..."
 msgstr "Bitte warten..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -613,20 +613,20 @@ msgstr "Überprüfe deine Einstellung der Nummer."
 msgid "Check your configuration."
 msgstr "Überprüfe deine Einstellungen."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Maschennetzwerk"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Maschennetzwerk %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Keine GSM-Verbindung verfügbar."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Verbindung in der Menüleiste erstellen."
 
@@ -1012,26 +1012,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Um die Änderungen zu übernehmen, muss Sugar neu gestartet werden.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Warnung"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Neustart zur Übernahme der Änderungen notwendig"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Änderungen verwerfen"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Später"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Jetzt neu starten"
 
@@ -1070,7 +1070,7 @@ msgstr "Behalten"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Löschen"
@@ -1169,26 +1169,33 @@ msgstr "Favoritenansicht"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Schlüsseltyp:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Authentifizierungstyp:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "WLAN-Sicherheit:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Fortsetzen"
@@ -1198,12 +1205,12 @@ msgstr "Fortsetzen"
 msgid "Join"
 msgstr "Beitreten"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Ad-hoc-Netzwerk %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Maschennetzwerk %d"
@@ -1379,81 +1386,81 @@ msgid "Tags:"
 msgstr "Stichwörter:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Tagebuch"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Suchen"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Beliebiges Datum"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Heute"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Seit gestern"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Vergangene Woche"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Vergangener Monat"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Vergangenes Jahr"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Alle"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Meine Freunde"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Meine Klasse"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Alles"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Kopieren nach"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Fehler beim Kopieren des Eintrags. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1461,24 +1468,24 @@ msgstr "Fehler"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Start"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Nach Änderungsdatum sortieren"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Nach Erstellungsdatum sortieren"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Nach Größe sortieren"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "Ansicht sortieren"
 
diff --git a/po/el.po b/po/el.po
index 3f6a58a..453067d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-09-30 09:57+0200\n"
 "Last-Translator: pavlos hatzopoulos <phatzopoulos@gmail.com>\n"
 "Language-Team: Greek <olpc@grnet.gr>\n"
@@ -61,48 +61,48 @@ msgstr "Πατήστε για να αλλάξετε χρώμα:"
 msgid "About my Computer"
 msgstr "Σχετικά με τον υπολογιστή μου"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Δεν είναι διαθέσιμο"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Σειριακός αριθμός:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Λογισμικό"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Αναγνωριστικό έκδοσης:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Υλικολογισμικό Ασύρματου:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Πνευματικά δικαιώματα & Άδεια"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -115,7 +115,7 @@ msgstr ""
 "μετατρέψετε και να διανείμετε αντίγραφά του, πάντα υπό τους όρους της άδειας "
 "που περιγράφεται εδώ."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Πλήρης άδεια:"
 
@@ -452,25 +452,25 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Σύνδεση..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Συνδέθηκε"
 
@@ -499,9 +499,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Σύνδεση"
 
@@ -559,21 +559,21 @@ msgstr "Ελέγξτε τις ρυθμίσεις Αριθμών."
 msgid "Check your configuration."
 msgstr "Ελέγξτε τις ρυθμίσεις σας."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Δίκτυο πλέγματος"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, 
+#: ../extensions/deviceicon/network.py:659
 #, python-format
+#, python-format,
 msgid "Mesh Network %s"
 msgstr "Δίκτυο πλέγματος %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Δεν υπάρχει σύνδεση GSM."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Δημιουργία σύνδεσης στον πίνακα ελέγχου."
 
@@ -954,26 +954,26 @@ msgstr ""
 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/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Οι αλλαγές απαιτούν επανεκκίνηση"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Ακύρωση αλλαγών"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Αργότερα"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Επανεκκίνηση τώρα"
 
@@ -1012,7 +1012,7 @@ msgstr "Διατήρησε"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Διαγραφή"
@@ -1108,25 +1108,32 @@ msgstr "Προβολή αγαπημένων"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Τύπος Κλειδιού"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Τύπος Πιστοποίησης"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Ιδιωτικό"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Συνέχιση"
@@ -1136,14 +1143,14 @@ msgstr "Συνέχιση"
 msgid "Join"
 msgstr "Σύνδεση"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Δίκτυο Ad-hoc %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format, 
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
+#, python-format,
 msgid "Mesh Network %d"
 msgstr "Δίκτυο πλέγματος %d"
 
@@ -1316,101 +1323,101 @@ msgid "Tags:"
 msgstr "Ετικέτες:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Ημερολόγιο"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Οποτεδήποτε"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Σήμερα"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Από χθες"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Περασμένη εβδομάδα"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Περασμένος μήνας"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Περασμένος χρόνος"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Οποιοσδήποτε"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Οι φίλοι μου"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Η τάξη μου"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Οτιδήποτε"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Αντιγραφή στο"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Δημιουργία αντίγραφου"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Λάθος κατά την αντιγραφή της καταχώρησης. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr "Λάθος"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Έναρξη"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Ταξινόμηση κατά ημερομηνία τροποποίησης"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Ταξινόμηση κατά ημερομηνία δημιουργίας"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Ταξινόμηση κατά μέγεθος"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "Προβολή ταξινόμησης"
 
diff --git a/po/es.po b/po/es.po
index e94da4c..4f6ae2f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-11-21 04:36+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
@@ -472,15 +472,15 @@ msgstr "Direccion IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Desconectar"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Conectando..."
@@ -488,8 +488,8 @@ msgstr "Conectando..."
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Conectado"
@@ -519,8 +519,8 @@ msgid "Please wait..."
 msgstr "Espere por favor..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Conectar"
@@ -579,20 +579,20 @@ msgstr "Revise el Número en la configuración."
 msgid "Check your configuration."
 msgstr "Revise su configuración."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Red Malla"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Red Malla %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "No se dispone de conexión GSM."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Crear una conexión en el panel de control."
 
@@ -980,26 +980,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Advertencia"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Los cambios requieren reiniciar"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Cancelar cambios"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Después"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Reiniciar ahora"
 
@@ -1136,20 +1136,27 @@ msgstr "Vista de favoritos"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
 # This is an encryption key type, not a keyboard key
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tipo de clave:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tipo de autenticación:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Seguridad inalámbrica:"
 
@@ -1166,7 +1173,7 @@ msgstr "Retomar"
 msgid "Join"
 msgstr "Unirse"
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Red específica %d"
diff --git a/po/fa.po b/po/fa.po
index 1b41bc8..5256d22 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-01-09 10:16+0000\n"
 "Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,48 +60,48 @@ msgstr "برای تبدیلی رنگ تیک کن:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -109,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -143,6 +143,7 @@ msgid "instantaneous"
 msgstr ""
 
 #: ../extensions/cpsection/frame/view.py:29
+#, python-format
 #, python-format, fuzzy
 msgid "%s seconds"
 msgstr "%d ثانیه ها"
@@ -435,25 +436,25 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 #, fuzzy
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -482,9 +483,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -542,20 +543,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "شبکه بافته شده"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "شبکه بافته شده"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -906,26 +908,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "برای اجرا نمودن تغیرات تان شما باید شوگر را دوباره چالان کنید\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -960,7 +962,7 @@ msgstr "نگه داشتن"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1052,25 +1054,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "نوعیت کلید:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "نوعیت تصدیق:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "از سر گرفتن"
@@ -1080,12 +1089,13 @@ msgstr "از سر گرفتن"
 msgid "Join"
 msgstr "پیوستن"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "شبکه بافته شده"
@@ -1258,101 +1268,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/fa_AF.po b/po/fa_AF.po
index 7a81c1a..8fb3ef2 100644
--- a/po/fa_AF.po
+++ b/po/fa_AF.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-02-06 06:09-0500\n"
 "Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,48 +60,48 @@ msgstr "برای تبدیلی رنگ تیک کن:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "در دسترس نیست"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -109,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -143,6 +143,7 @@ msgid "instantaneous"
 msgstr ""
 
 #: ../extensions/cpsection/frame/view.py:29
+#, python-format
 #, python-format, fuzzy
 msgid "%s seconds"
 msgstr "%d ثانیه ها"
@@ -435,25 +436,25 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 #, fuzzy
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -482,9 +483,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -542,20 +543,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "شبکه تنیده"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "شبکه تنیده"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -906,26 +908,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "برای اجرا نمودن تغیرات تان شما باید شکر را دوباره آغاز کنید.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -960,7 +962,7 @@ msgstr "نگه داشتن"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1052,25 +1054,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "نوعیت کلید:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "نوعیت تصدیق:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "ادامه"
@@ -1080,12 +1089,13 @@ msgstr "ادامه"
 msgid "Join"
 msgstr "پیوستن"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "شبکه تنیده"
@@ -1258,101 +1268,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 20fd92f..70d19b5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-10-10 06:21+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -73,48 +73,48 @@ msgstr "Cliquer pour changer de couleur :"
 msgid "About my Computer"
 msgstr "À propos de mon ordinateur"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Non disponible"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s : %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identité"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Numéro de série :"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Logiciel"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Version :"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar :"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Micrologiciel :"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Micrologiciel sans fil :"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Copyright et licence"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -126,7 +126,7 @@ msgstr ""
 "License). Vous êtes autorisé à le modifier et/ou à en distribuer des copies "
 "aux conditions spécifiées."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Licence complète :"
 
@@ -461,25 +461,25 @@ msgstr "Adresse IP : %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Déconnecter"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Connexion..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Connecté"
 
@@ -508,9 +508,9 @@ msgid "Please wait..."
 msgstr "Patienter..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Connecter"
 
@@ -568,20 +568,20 @@ msgstr "Vérifiez la configuration du numéro."
 msgid "Check your configuration."
 msgstr "Vérifiez votre configuration."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Réseau maillé"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Réseau maillé %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Aucune connexion GSM disponible."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Créez une connexion dans le panneau de contrôle."
 
@@ -962,26 +962,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Redémarrer sugar pour que les changements prennent effet.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Attention"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Relancer pour valider"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Abandonner"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Plus tard"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Maintenant"
 
@@ -1021,7 +1021,7 @@ msgstr "Conserver"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Supprimer"
@@ -1118,26 +1118,33 @@ msgstr "Écran favoris"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Type de clé :"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Type d'authentification :"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Sécurité sans fil :"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Reprendre"
@@ -1147,12 +1154,12 @@ msgstr "Reprendre"
 msgid "Join"
 msgstr "Rejoindre"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Réseau ad-hoc %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Réseau maillé %d"
@@ -1326,81 +1333,81 @@ msgid "Tags:"
 msgstr "Étiquettes :"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Journal"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "N'importe quand"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Depuis hier"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Depuis une semaine"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Depuis un mois"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Depuis une année"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Tout le monde"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Mes amis"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Ma classe"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Tout"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Copier vers"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Recopier"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Erreur lors de la copie de l'entrée. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1408,24 +1415,24 @@ msgstr "Erreur"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Lancer"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Trier sur la date de modification"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Trier sur la date de création"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Trier sur la taille"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "Trier l'affichage"
 
diff --git a/po/hi.po b/po/hi.po
index 51715f7..75f65a5 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2,12 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 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: 2011-10-05 09:14+0200\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2011-11-30 06:09+0200\n"
 "Last-Translator: satyaakam goswami <satyaakam@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hi\n"
@@ -47,11 +59,11 @@ msgstr "भरें:     %s"
 
 #: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
-msgstr "दिए गये रंगरूपांतर के वर्णन मे ग़लती है"
+msgstr "निर्दिष्ट रंग परिवर्धकों में त्रुटि है."
 
 #: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
-msgstr "दिए गये रंगो के वर्णन मे ग़लती है"
+msgstr "निर्दिष्ट रंगों में त्रुटि है."
 
 #: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
@@ -61,48 +73,48 @@ msgstr "रंग बदलने हेतु क्लिक करें:"
 msgid "About my Computer"
 msgstr "मेरे कम्प्यूटर के बारे में"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
-msgstr "उपलब्ध नही है"
+msgstr "उपलब्ध नहीं है"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "पहचान"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
-msgstr "सरल क्रमांक:"
+msgstr "क्रमांक:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "सॉफ्टवेयर"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "बिल्ड:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "सुगर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "फर्मवेयर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "वायरलेस फर्मवेयर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "सर्वाधिकार तथा लाइसेंस"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -114,7 +126,7 @@ msgstr ""
 "लाइसेंस में दिए गए कुछ विशेष शर्तों के अधीन आप इसमें परिवर्तन करने या इसकी "
 "प्रति बनाकर वितरण करने के लिए आपका स्वागत है."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "पूरा लाइसेंस:"
 
@@ -124,7 +136,7 @@ msgstr "तारीख़ व समय"
 
 #: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
-msgstr "गलती:  समयक्षेत्र मौजूद नही है"
+msgstr "त्रुटि समयक्षेत्र मौजूद नहीं है."
 
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
@@ -188,17 +200,17 @@ msgstr "भाषा"
 
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "~/.i18n पर पहुँच नहीं सका. मानक सेटिंग बनाएँ"
+msgstr "~/.i18n पर पहुँच नहीं सका. मानक सेटिंग बनाएँ."
 
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
-msgstr "कूट की भाषा = %s अग्यात है"
+msgstr "कोड=%s की भाषा का निर्धारण नहीं किया जा सका."
 
 #: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
-msgstr "माफ़ कीजिए , मैं %s नही बोलता"
+msgstr "माफ़ कीजिए, मैं '%s' नहीं बोलता."
 
 #: ../extensions/cpsection/language/view.py:57
 msgid ""
@@ -210,19 +222,19 @@ msgstr ""
 
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
 msgid "Modem Configuration"
-msgstr "मोडेम विन्यास"
+msgstr "मॉडेम विन्यास"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
-msgstr "उपयोक्ता नाम"
+msgstr "उपयोक्ता नाम:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
-msgstr "कूटशब्द"
+msgstr "पासवर्ड:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
-msgstr "नम्बर"
+msgstr "नम्बर:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
@@ -234,14 +246,14 @@ msgstr "व्यक्तिगत पहचान संख्या (PIN):"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
-msgstr "व्यक्तिगत निरुद्ध  कुंजी (PUK):"
+msgstr "व्यक्तिगत निरुद्ध कुंजी (PUK):"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:175
 msgid ""
 "You will need to provide the following information to set up a mobile "
 "broadband connection to a cellular (3G) network."
 msgstr ""
-"आप निम्नलिखित जानकारी प्रदान करने के लिए एक सेलुलर  संजाल(3 जी) के लिए एक "
+"आप निम्नलिखित जानकारी प्रदान करने के लिए एक सेलुलर संजाल(3 जी) के लिए एक "
 "मोबाइल ब्रॉडबैंड कनेक्शन के सेट की आवश्यकता होगी."
 
 #: ../extensions/cpsection/network/__init__.py:21
@@ -251,11 +263,11 @@ msgstr "संजाल"
 
 #: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
-msgstr "स्थिति अज्ञात है"
+msgstr "स्थिति अज्ञात है."
 
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
-msgstr "दिए गये रेडियो तर्क मे ग़लती है ,बंद/चालू का वापर करे"
+msgstr "निर्दिष्ट रेडियो तर्क चालू/बन्द प्रयोग करें में त्रुटि है."
 
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
@@ -277,7 +289,7 @@ msgstr "रेडियो"
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 "यदि आपको नेटवर्क में कनेक्ट करने में समस्या हो रही है तो नेटवर्क इतिहास को "
-"मिटा दें."
+"मिटा दें"
 
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
@@ -390,10 +402,11 @@ msgid "Download size: %s"
 msgstr "डाउनलोड आकार: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
-#, python-format, 
+#, python-format
+#, python-format, ,
 #, python-format,
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr "संस्करण %(current) से %(new) (आकार: %(size))"
+msgstr "संस्करण %(current)s %(new)s(आकार: %(नया))"
 
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
@@ -449,8 +462,8 @@ msgstr "आईपी पता: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "डिस्कनेक्ट"
 
@@ -460,17 +473,17 @@ msgstr "डिस्कनेक्ट"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "कनेक्टेड"
 
@@ -492,16 +505,16 @@ msgstr "गति"
 
 #: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
-msgstr "वायरलेस मॉडेम"
+msgstr "वायरलेस मॉडम"
 
 #: ../extensions/deviceicon/network.py:281
 msgid "Please wait..."
-msgstr "कृपया प्रतीक्षा करें ..."
+msgstr "कृपया प्रतीक्षा करें..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "कनेक्ट"
 
@@ -540,9 +553,8 @@ msgstr "%s के लिए जुड़ा"
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
 #, python-format
-#, python-format,
 msgid "%d KB"
-msgstr "%d कि.बा."
+msgstr "%dकि.बा."
 
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
@@ -560,20 +572,20 @@ msgstr "संख्या विन्यास की जाँच करे�
 msgid "Check your configuration."
 msgstr "आपके विन्यास की जाँच करें."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
-msgstr "मेश नेटवर्क"
+msgstr "मेश संजाल"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
-msgstr "मेश नेटवर्क  %s"
+msgstr "मेश नेटवर्क %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "कोई जीएसएम कनेक्शन उपलब्ध है."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "नियंत्रण कक्ष में एक कनेक्शन बनाएँ."
 
@@ -622,7 +634,7 @@ msgstr "क्रिया"
 
 #: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
-msgstr "पटचित्र"
+msgstr "स्क्रीनशॉट"
 
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
@@ -634,8 +646,8 @@ msgid ""
 "\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
 "long name."
 msgstr ""
-"आरंभीकरण पर निक \"अक्षम\" पूछने के लिए, \"सिस्टम\" यूनिक्स खाते लंबे नाम का पुन: "
-"उपयोग."
+"\"अक्षम\" के लिए initialization पर निक पूछा; \"व्यवस्था\" के लिए UNIX खाते लंबे "
+"नाम पुनः प्रयोग करे."
 
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
@@ -665,23 +677,23 @@ msgstr "किनारा देरी"
 
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
-msgstr "अप्राप्ति फ़ॉन्ट चेहरा"
+msgstr "डिफ़ाल्ट फाँट प्रतिरूप"
 
 #: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
-msgstr "अप्राप्ति फ़ॉन्ट का आकार"
+msgstr "डिफ़ाल्ट फॉण्ट आकार"
 
 #: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
-msgstr "अप्राप्ति निक"
+msgstr "डिफ़ॉल्ट निक"
 
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr "कोना का प्रयोग करते हुए फ्रेम एक्टिवेशन में देरी"
+msgstr "कोना का प्रयोग करते हुए फ्रेम एक्टिवेशन में देरी."
 
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
-msgstr "किनारा का प्रयोग करते हुए फ्रेम एक्टिवेशन में देरी"
+msgstr "किनारा का प्रयोग करते हुए फ्रेम एक्टिवेशन में देरी."
 
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
@@ -697,7 +709,7 @@ msgstr "पसंदीदा ख़ाका"
 
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
-msgstr "पसंदीदा पुनरारंभ  मोड"
+msgstr "पसंदीदा रेज्यूम मोड"
 
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
@@ -777,9 +789,9 @@ msgid ""
 "Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
 "hoc network."
 msgstr ""
-"सच तो, Sugar 1,6 चैनल और 11 के लिए डिफ़ॉल्ट तदर्थ संजाल दिखाएगा. यदि Sugar "
-"नहीं \"ज्ञात\" संजाल  देखता है जब यह शुरू होता है, यह नेटवर्क तदर्थ "
-"autoconnect करता है."
+"सच तो, Sugar1,6 चैनल और11 के लिए डिफ़ॉल्ट तदर्थ संजाल दिखाएगा. यदि Sugar "
+"नहीं \"ज्ञात\" संजाल देखता है जब यह शुरू होता है, यह नेटवर्क तदर्थ autoconnect "
+"करता है."
 
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
@@ -914,12 +926,12 @@ msgstr ""
 #: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
-msgstr "शुगर -कंट्रोल-पेनल: कुंजी =%s  विकल्प उपलब्ध नही है"
+msgstr "सुगर-कंट्रोल-पेनल: कुंजी=%s विकल्प उपलब्ध नहीं है"
 
 #: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
-msgstr "शुगर -कंट्रोल-पेनल: %s"
+msgstr "सुगर-कंट्रोल-पेनल: %s"
 
 # TRANS: Translators, there's a empty line at the end of this string,
 # which must appear in the translated string (msgstr) as well.
@@ -951,28 +963,28 @@ msgstr ""
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
-msgstr "अपने बदलावो को उपयोग मे लाने के लिए शुगर को पुनरारंभ करे .\n"
+msgstr "अपने परिवर्तनों को लागू करने के लिए आपको शुगर को पुनरारंभ करना होगा.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "परिवर्तनों के लिए कम्प्यूटर फिर से प्रारंभ करना आवश्यक है"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "परिवर्तनों को रद्द करें"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "बाद में"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "अभी फिर से प्रारंभ करें"
 
@@ -1007,7 +1019,7 @@ msgstr "रखें"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "मिटाएँ"
@@ -1064,7 +1076,7 @@ msgstr "आप अब अपने स्कूल के सर्वर से
 
 #: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
-msgstr "पंजीकृत करे"
+msgstr "पंजीकृत करें"
 
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
@@ -1101,26 +1113,33 @@ msgstr "पसंदीदा दृश्य"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
-msgstr "कुंजी का प्रकार"
+msgstr "कुंजी प्रकार:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
-msgstr "विश्वसनियता का प्रकार"
+msgstr "प्रमाणीकरण का प्रकार:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 व्यक्तिगत"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "बेतार सुरक्षा:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "पुनरारंभ"
@@ -1128,17 +1147,17 @@ msgstr "पुनरारंभ"
 #: ../src/jarabe/desktop/meshbox.py:96
 #: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
-msgstr "जोड़े"
+msgstr "जुड़ें"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
-msgstr "Ad-hoc संजाल %d"
+msgstr "तदर्थ संजाल %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
-msgstr "मेश नेटवर्क  %d"
+msgstr "मेश संजाल %d"
 
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
@@ -1250,7 +1269,7 @@ msgstr "नाम:"
 
 #: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
-msgstr "रंग बदलने के लिए दबाए"
+msgstr "रंग बदलने के लिए क्लिक करें:"
 
 #: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
@@ -1302,88 +1321,89 @@ msgstr "प्रतिभागी:"
 
 #: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
-msgstr "वर्णनः"
+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/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
-msgstr "चिठ्ठा"
+msgstr "दैनिकी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "ढूंढें"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "कभी भी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "आज"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "कल से"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
-msgstr "पिछला हफ्ता"
+msgstr "पिछला सप्ताह"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "पिछला महीना"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
-msgstr "पिछला साल"
+msgstr "पिछला वर्ष"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "कोई भी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
-msgstr "मेरे दोस्त"
+msgstr "मेरे मित्र"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "मेरी कक्षा"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "कुछ भी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "पर प्रतिलिपि बनाएँ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "दूसरी प्रति"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Error while copying the entry. %s"
-msgstr "%s की प्रतिलिपि ()बनाते समय त्रुटी हुई"
+msgstr "नकल प्रविष्टि जबकि त्रुटि. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1391,24 +1411,24 @@ msgstr "त्रुटि"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "प्रारंभ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "तिथि के अनुसार छाँटें संशोधित"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "तिथि के अनुसार छाँटें बनाया"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "आकार के अनुसार छाँटें"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "छाटें देखें"
 
@@ -1438,9 +1458,10 @@ msgid "Older Version Of %s Activity"
 msgstr "%s की गतिविधि के पुराने संस्करण"
 
 #: ../src/jarabe/journal/misc.py:274
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Do you want to downgrade to version %s"
-msgstr "क्या आप संस्करण %s पर डाउनग्रेड ()करना चाहते हैं ()"
+msgstr "क्या आप डाउनग्रेड संस्करण चाहते हैं %s"
 
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
@@ -1522,23 +1543,23 @@ msgstr "%(free_space)d मे.बा. रिक्त"
 
 #: ../src/jarabe/model/network.py:163
 msgid "The reason for the device state change is unknown."
-msgstr "युक्ति यन्त्र बदलने के लिए कारण अज्ञात है."
+msgstr "यंत्र बदलने के लिए कारण अज्ञात है."
 
 #: ../src/jarabe/model/network.py:165
 msgid "The state change is normal."
-msgstr "परिवर्तन सामान्य है."
+msgstr "परिस्तिथि परिवर्तन सामान्य है."
 
 #: ../src/jarabe/model/network.py:167
 msgid "The device is now managed."
-msgstr "डिवाइस अब प्रबंधित है."
+msgstr "यंत्र अब प्रबंधित है."
 
 #: ../src/jarabe/model/network.py:169
 msgid "The device is no longer managed."
-msgstr "डिवाइस अब प्रबंधित नहीं है."
+msgstr "यंत्र अब प्रबंधित नहीं है."
 
 #: ../src/jarabe/model/network.py:171
 msgid "The device could not be readied for configuration."
-msgstr "युक्ति विन्यास के लिए सुसज्जित नहीं सकता."
+msgstr "यंत्र विन्यास के लिए सुसज्जित नहीं है."
 
 #: ../src/jarabe/model/network.py:173
 msgid ""
@@ -1553,17 +1574,17 @@ msgstr "आईपी ​​विन्यास अब वैध नहीं �
 
 #: ../src/jarabe/model/network.py:178
 msgid "Secrets were required, but not provided."
-msgstr "जिन रहस्यों की आवश्यकता थी, वे दिए नहीं गए"
+msgstr "पासवर्ड की आवश्यकता है, लेकिन नहीं दी."
 
 #: ../src/jarabe/model/network.py:180
 msgid ""
 "The 802.1X supplicant disconnected from the access point or authentication "
 "server."
-msgstr "802.1X निवेदक पहुँच बिंदु या प्रमाणीकरण सर्वर से काट दिया."
+msgstr "802.1X निवेदक पहुँच बिंदु या प्रमाणीकरण सर्वर से कट गया."
 
 #: ../src/jarabe/model/network.py:183
 msgid "Configuration of the 802.1X supplicant failed."
-msgstr "802.1X निवेदक के कॉन्फ़िगरेशन असफल रहा."
+msgstr "802.1X निवेदक के विन्यास असफल रहा."
 
 #: ../src/jarabe/model/network.py:185
 msgid "The 802.1X supplicant quit or failed unexpectedly."
@@ -1571,7 +1592,7 @@ msgstr "802.1X निवेदक छोड़ दिया है या अन
 
 #: ../src/jarabe/model/network.py:187
 msgid "The 802.1X supplicant took too long to authenticate."
-msgstr "802.1X निवेदक के प्रमाणित होने में बहुत देर ही गयी"
+msgstr "802.1X निवेदक भी लंबे समय प्रमाणित करने के लिए ले लिया."
 
 #: ../src/jarabe/model/network.py:189
 msgid "The PPP service failed to start within the allowed time."
@@ -1579,11 +1600,11 @@ msgstr "पीपीपी सेवा समय के भीतर शुर�
 
 #: ../src/jarabe/model/network.py:191
 msgid "The PPP service disconnected unexpectedly."
-msgstr "PPP सेवा अचानक दिस्कोंनेक्ट हो गयी"
+msgstr "पीपीपी सेवा अनपेक्षित रूप से कट गया."
 
 #: ../src/jarabe/model/network.py:193
 msgid "The PPP service quit or failed unexpectedly."
-msgstr "PPP सेवा अचानक बंद या विफल हो गयी"
+msgstr "पीपीपी सेवा छोड़ दिया है या अनपेक्षित रूप से विफल रहा है."
 
 #: ../src/jarabe/model/network.py:195
 msgid "The DHCP service failed to start within the allowed time."
@@ -1591,11 +1612,11 @@ msgstr "DHCP सेवा की अनुमति दी समय के भ�
 
 #: ../src/jarabe/model/network.py:197
 msgid "The DHCP service reported an unexpected error."
-msgstr "DHCP सेवा ने एक अनुपेक्षित त्रुटी सूचित की"
+msgstr "DHCP सेवा एक अनपेक्षित त्रुटि की सूचना दी."
 
 #: ../src/jarabe/model/network.py:199
 msgid "The DHCP service quit or failed unexpectedly."
-msgstr "DHCP सेवा अचानक बंद या विफल हो गयी"
+msgstr "DHCP सेवा छोड़ दिया है या अनपेक्षित रूप से विफल रहा है."
 
 #: ../src/jarabe/model/network.py:201
 msgid "The shared connection service failed to start."
@@ -1603,15 +1624,15 @@ msgstr "साझा कनेक्शन सेवा प्रारंभ �
 
 #: ../src/jarabe/model/network.py:203
 msgid "The shared connection service quit or failed unexpectedly."
-msgstr "साझा कनेक्शन सेवा छोड़ने या अनपेक्षित रूप से विफल रहा है"
+msgstr "साझा कनेक्शन सेवा छोड़ने या अनपेक्षित रूप से विफल रहा है."
 
 #: ../src/jarabe/model/network.py:206
 msgid "The AutoIP service failed to start."
-msgstr "AutoIP सेवा प्रारंभ करने में विफल"
+msgstr "AutoIP सेवा प्रारंभ करने में विफल."
 
 #: ../src/jarabe/model/network.py:208
 msgid "The AutoIP service reported an unexpected error."
-msgstr "AutoIP सेवा एक अनपेक्षित त्रुटि की सूचना दी"
+msgstr "AutoIP सेवा एक अनपेक्षित त्रुटि की सूचना दी."
 
 #: ../src/jarabe/model/network.py:210
 msgid "The AutoIP service quit or failed unexpectedly."
@@ -1639,7 +1660,7 @@ msgstr "डायलिंग में विफल रहा."
 
 #: ../src/jarabe/model/network.py:222
 msgid "Modem initialization failed."
-msgstr "मोडेम आरंभीकरण में विफल रहा है"
+msgstr "मोडेम आरंभीकरण में विफल रहा है."
 
 #: ../src/jarabe/model/network.py:224
 msgid "Failed to select the specified GSM APN"
@@ -1647,19 +1668,19 @@ msgstr "निर्दिष्ट जीएसएम APN का चयन क�
 
 #: ../src/jarabe/model/network.py:226
 msgid "Not searching for networks."
-msgstr "निर्दिष्ट जीएसएम APN का चयन करने में विफल"
+msgstr "संजाल नहीं खोजा."
 
 #: ../src/jarabe/model/network.py:228
 msgid "Network registration was denied."
-msgstr "संजाल पंजीयन इनकार कर दिया था"
+msgstr "संजाल पंजीयन इनकार कर दिया था."
 
 #: ../src/jarabe/model/network.py:230
 msgid "Network registration timed out."
-msgstr "संजाल पंजीयन समयबाह्य हो"
+msgstr "संजाल पंजीयन समयबाह्य हो."
 
 #: ../src/jarabe/model/network.py:232
 msgid "Failed to register with the requested GSM network."
-msgstr "अनुरोध जीएसएम संजाल के साथ पंजीकृत करने में विफल"
+msgstr "अनुरोध जीएसएम संजाल के साथ पंजीकृत करने में विफल."
 
 #: ../src/jarabe/model/network.py:234
 msgid "PIN check failed."
@@ -1671,7 +1692,7 @@ msgstr "इस डिवाइस के लिए आवश्यक फर्�
 
 #: ../src/jarabe/model/network.py:238
 msgid "The device was removed."
-msgstr "डिवाइस हटा दिया था"
+msgstr "डिवाइस हटा दिया था."
 
 #: ../src/jarabe/model/network.py:240
 msgid "NetworkManager went to sleep."
@@ -1679,27 +1700,27 @@ msgstr "NetworkManager सो गया."
 
 #: ../src/jarabe/model/network.py:242
 msgid "The device's active connection was removed or disappeared."
-msgstr "डिवाइस सक्रिय कनेक्शन हटा या गायब हो गया था"
+msgstr "डिवाइस सक्रिय कनेक्शन हटा या गायब हो गया था."
 
 #: ../src/jarabe/model/network.py:245
 msgid "A user or client requested the disconnection."
-msgstr "एक उपयोगकर्ता या ग्राहक के वियोग का अनुरोध किया"
+msgstr "एक उपयोगकर्ता या ग्राहक के वियोग का अनुरोध किया."
 
 #: ../src/jarabe/model/network.py:247
 msgid "The device's carrier/link changed."
-msgstr "डिवाइस कैरियर / लिंक बदल गया"
+msgstr "डिवाइस कैरियर / लिंक बदल गया."
 
 #: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
-msgstr "दोस्त को हटाएँ"
+msgstr "मित्र हटाएँ"
 
 #: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
-msgstr "दोस्त बनाओ"
+msgstr "मित्र बनाएँ"
 
 #: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
-msgstr "बन्दकरें"
+msgstr "बन्द करें"
 
 #: ../src/jarabe/view/buddymenu.py:95
 msgid "Restart"
@@ -1716,7 +1737,7 @@ msgstr "मेरे सेटिंग"
 #: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
-msgstr "%s निमंत्रित करें"
+msgstr "%s को निमंत्रित करें"
 
 #: ../src/jarabe/view/launcher.py:145
 #, python-format
@@ -1725,11 +1746,11 @@ msgstr "<b>%s</b> प्रारंभ करने में विफल."
 
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
-msgstr "शुरू हो रहा है"
+msgstr "प्रारंभ हो रहा है..."
 
 #: ../src/jarabe/view/palettes.py:58
 msgid "Activity failed to start"
-msgstr "गतिविधि शुरू होने में विफल रही"
+msgstr "गतिविधि शुरू करने में विफल"
 
 #. TODO: share-with, keep
 #: ../src/jarabe/view/palettes.py:91
@@ -1755,7 +1776,7 @@ msgstr "हटाएँ"
 
 #: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
-msgstr "उदाहरण स्रोत"
+msgstr "इंस्टैंस स्रोत"
 
 #: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
@@ -1767,7 +1788,7 @@ msgstr "क्रिया बंडल स्रोत"
 
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
-msgstr "सुगर औज़ारसंग्रह स्रोत"
+msgstr "Sugar टूलकिट स्रोत"
 
 #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
@@ -1776,25 +1797,34 @@ msgstr "स्रोत देखें: %r"
 
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
-msgstr "एक खिड़की में शुगर"
+msgstr "Sugar खिड़की मे"
+
+#~ msgid "Copy"
+#~ msgstr "नक़ल"
 
 # Only show disconnect when there's a mesh device, because mesh takes
 # priority over the normal wireless device.  NM doesn't have a "disconnect"
 # method for a device either (for various reasons) so this doesn't
 # have a good mapping
 #~ msgid "Disconnect..."
-#~ msgstr " सम्पर्क तोडे"
+#~ msgstr "डिस्कनेक्ट..."
+
+#~ msgid "APN:"
+#~ msgstr "एपीएन:"
 
 #~ msgid "Create new wireless network"
 #~ msgstr "नया वायरलेस नेटवर्क बनाएँ"
 
 #, python-format
-#, fuzzy
 #~ msgid "%s's network"
-#~ msgstr "%s का नेटवर्क %s"
+#~ msgstr "%s का नेटवर्क"
 
-#~ msgid "Copy"
-#~ msgstr "नक़ल"
+#, python-format
+#~ msgid "Data sent %d kb / received %d kb"
+#~ msgstr "प्रेषित आंकड़े %d kb / प्राप्त %d kb"
+
+#~ msgid "Connection time "
+#~ msgstr "कनेक्शन समय"
 
 #~ msgid "Title"
 #~ msgstr "शीर्षक"
diff --git a/po/ht.po b/po/ht.po
index 2ac7225..88efc8f 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-03-12 09:14-0400\n"
 "Last-Translator: Jude Augusma <jayme2901@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,48 +60,48 @@ msgstr "Klike pou chanje koulè"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Pa disponib"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -109,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -435,8 +435,8 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 #, fuzzy
 msgid "Disconnect"
 msgstr "Dekonekte"
@@ -447,18 +447,18 @@ msgstr "Dekonekte"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 #, fuzzy
 msgid "Connecting..."
 msgstr "Dekonekte..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -487,9 +487,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -547,20 +547,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Rezo "
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "Rezo "
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -921,26 +922,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Pou aplike chanjman ou yo ou bezwen reyinisyalize program nan.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -975,7 +976,7 @@ msgstr ""
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1067,25 +1068,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tip kle:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tip otantifikasyon:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Repwann"
@@ -1095,12 +1103,13 @@ msgstr "Repwann"
 msgid "Join"
 msgstr "Rankontre"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "Rezo "
@@ -1273,101 +1282,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/hus.po b/po/hus.po
index c74e3d9..4e7b53a 100644
--- a/po/hus.po
+++ b/po/hus.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-10-17 15:18+0200\n"
 "Last-Translator: Francisco <fordazmx@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,48 +61,48 @@ msgstr "Klik abal ki jalk'uy an mukuxtaláb:"
 msgid "About my Computer"
 msgstr "Tin kwentaj u ábatnom pat'al"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Yab jolat"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Ibil"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "In áy an ajixtaláb pat'ál:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Inkixtaláb:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Firmware k'al an yab tsájlidh polts'oxtaláb:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "K'ij ani in alwa'taláb an tsejk'om"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -114,7 +114,7 @@ msgstr ""
 "Pública General, ani kw'ajat it kanidh abal ka jalk'uy ani ka buk'uw i "
 "k'ot'bidh dhuchlab k'al junchik i jólat xi dhuchadh tin ebal jajá'."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Putat jólataláb:"
 
@@ -461,24 +461,24 @@ msgstr "IP belil: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Ka t'ixk'a ti ts'ot'k'oxtaláb"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "In t'sot'k'oyal..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "T'sot'k'odh"
 
@@ -507,9 +507,9 @@ msgid "Please wait..."
 msgstr "Pakwlanchij aychij jún we'..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Ka ts'ot'k'oy"
 
@@ -567,20 +567,20 @@ msgstr "Ka tsab met'a' an ajixtaláb k'al an t'ojojóxtaláb."
 msgid "Check your configuration."
 msgstr "Ka tsab met'a' an t'ojojóxtaláb."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Dhikab polts'oxtaláb"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Dhikab polts'oxtaláb %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Yab wa'ats i ts'ot'k'oxtaláb GSM."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Inkiy jun i ts'ot'k'oxtaláb ti ok'nom mét'nib."
 
@@ -1010,26 +1010,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Abal ka dhaya' axi a jalk'uy in yejenchal ka tsab tujchij sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Ok'xidh ólchixtaláb"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "An jalk'untaláb in yejenchal ka tsab tujchij"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "T'apiy axi a jalk'uy"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Talbel"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Ka tsab tujchij xowé'"
 
@@ -1064,7 +1064,7 @@ msgstr "Dhaya'"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Pakuw"
@@ -1157,25 +1157,32 @@ msgstr "Tsu'uw xa kulbetnal"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Alwá' an tsinatbijiláb:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Ki exla' in chubax éy k'al an dhuche':"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ani WPA2 kwetemtal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Yab tsajlidh beletnaxtalab:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Áynanchij"
@@ -1185,12 +1192,12 @@ msgstr "Áynanchij"
 msgid "Join"
 msgstr "Kit junkun"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Polts'oxtaláb Ad-hoc %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Polts'oxtaláb dhikadh %d"
@@ -1362,101 +1369,101 @@ msgid "Tags:"
 msgstr "Dhuchadh ts'at'at' úw:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Chudhél dhuchlab"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Aliy"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Jawa'kits tam k'ij"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Xowe'"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Ma ti we'el"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Ti wat'ey búk a k'icháj"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Ti wa'tey a its'"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Ti wa'tey a tamub"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Jawa'kits"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "U ja'ubchik"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "U exobintalábil"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Jawa'kits"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Ka k'ot'biy ti"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Tsábedha'"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "K'ibts'ontaláb tam ti k'ot'biy an otseltaláb. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr "K'ibts'ontaláb"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Tujtal"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Ka k'elbay tin ajumtal íts' tam ti jalk'uyat"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Ka k'elbay tin ajumtal íts' tam ti ts'ejka'"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Ka k'elbay k'al in puwél"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "K'elbadh ti ka tsu'uw"
 
diff --git a/po/hy.po b/po/hy.po
index 05f821d..3fb371d 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-12-19 17:27+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -450,23 +450,23 @@ msgstr "IP հասցեն է` %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Անջատում"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Միացվում է..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Միացված է"
@@ -496,8 +496,8 @@ msgid "Please wait..."
 msgstr "Խնդրում ենք սպասել..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Միացում"
@@ -556,20 +556,20 @@ msgstr "Ստուգեք ձեր Համարի կազմաձևումը:"
 msgid "Check your configuration."
 msgstr "Ստուգեք ձեր կազմաձևումը:"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Բջջային Ցանց"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Բջջային Ցանց %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "GSM միացումը մատչելի չէ:"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Ստեղծել միացում կառավարման վահանակի միջոցով:"
 
@@ -950,26 +950,26 @@ msgstr ""
 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/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Փոփոխությունները պահանջում են վերամեկնարկ"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Չեղարկել փոփոխությունները"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Հետո"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Վերամեկնարկել հիմա"
 
@@ -1098,19 +1098,26 @@ msgstr "Ընտրյալների տեսքը"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Ստեղնատեսակը."
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Նույնականացման Տեսակը."
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Անհատական"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Անլար կապի անվտանգության."
 
@@ -1126,7 +1133,7 @@ msgstr "Վերադառնալ"
 msgid "Join"
 msgstr "Միանալ"
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Ad-hoc /ներքին/ Ցանց %d"
diff --git a/po/id.po b/po/id.po
index 7fd0d5d..0964257 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-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"
@@ -18,188 +18,195 @@ msgstr ""
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
-msgstr ""
+msgstr "Mengenai Saya"
 
 #: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
-msgstr ""
+msgstr "Anda harus memasukkan nama."
 
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
-msgstr ""
+msgstr "goresan:   warna=%s corak=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
-msgstr ""
+msgstr "goresan:   %s"
 
 #: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
-msgstr ""
+msgstr "isi:     warna=%s corak=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
-msgstr ""
+msgstr "isi:     %s"
 
 #: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
-msgstr ""
+msgstr "Kesalahan dalam pengubah warna tertentu."
 
 #: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
-msgstr ""
+msgstr "Kesalahan dalam warna tertentu."
 
 #: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
-msgstr ""
+msgstr "Klik untuk mengubah warna anda:"
 
 #: ../extensions/cpsection/aboutcomputer/__init__.py:21
 msgid "About my Computer"
-msgstr ""
+msgstr "Tentang komputer saya"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
-msgstr ""
+msgstr "Tidak tersedia"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
-msgstr ""
+msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
-msgstr ""
+msgstr "Identitas"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
-msgstr ""
+msgstr "Nomer serial:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
-msgstr ""
+msgstr "Piranti lunak"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
-msgstr ""
+msgstr "Bikinan:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
-msgstr ""
+msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
-msgstr ""
+msgstr "Piranti lunak perangkat:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
-msgstr ""
+msgstr "Piranti lunak perangkat nirkabel:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
-msgstr ""
+msgstr "Hak Cipta dan Lisensi"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
 "change it and/or distribute copies of it under certain conditions described "
 "therein."
 msgstr ""
+"Sugar adalah antar-muka grafis pengguna yang sedang Anda lihat ini. Sugar "
+"adalah piranti lunak bebas, dengan lisensi GNU General Public License "
+"(Lisensi Publik Umum GNU), dan Anda dipersilakan untuk mengubahnya dan/atau "
+"menyebarluaskan salinannya sesuai ketentuan-ketentuan yang tercantum di "
+"dalam lisensi tersebut."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
-msgstr ""
+msgstr "Lisensi selengkapnya:"
 
 #: ../extensions/cpsection/datetime/__init__.py:21
 msgid "Date & Time"
-msgstr ""
+msgstr "Tanggal & Waktu"
 
 #: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
-msgstr ""
+msgstr "Ada kesalahan: Zona waktu tidak tersedia."
 
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
-msgstr ""
+msgstr "Zona waktu"
 
 #: ../extensions/cpsection/frame/__init__.py:21
 msgid "Frame"
-msgstr ""
+msgstr "Bingkai"
 
 #: ../extensions/cpsection/frame/model.py:41
 #: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
-msgstr ""
+msgstr "Harus nilai integer."
 
 #: ../extensions/cpsection/frame/view.py:27
 msgid "never"
-msgstr ""
+msgstr "tak pernah"
 
 #: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
-msgstr ""
+msgstr "seketika"
 
 #: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
-msgstr ""
+msgstr "%s detik"
 
 #: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
-msgstr ""
+msgstr "Waktu Tunda Aktivasi"
 
 #: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
-msgstr ""
+msgstr "Pojok"
 
 #: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
-msgstr ""
+msgstr "Sisi"
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
 #: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
-msgstr ""
+msgstr "Papan Ketik"
 
 #: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
-msgstr ""
+msgstr "Model Papan Ketik"
 
 #: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
-msgstr ""
+msgstr "Kunci untuk mengubah tatanan"
 
 #: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
-msgstr ""
+msgstr "Tatanan Papan Ketik"
 
 #: ../extensions/cpsection/language/__init__.py:21
 #: ../extensions/cpsection/language/view.py:33
 msgid "Language"
-msgstr ""
+msgstr "Bahasa"
 
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
+msgstr "Tak bisa meng-akses ~/.i18n. Menggunakan konfigurasi standar saja."
 
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
-msgstr ""
+msgstr "Bahasa dengan kode=%s tak bisa ditentukan."
 
 #: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
-msgstr ""
+msgstr "Mohon maaf, saya tidak berbicara dengan bahasa '%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 ""
+"Tambahkan bahasa-bahasa dalam perintah yang anda perkenan. Jika terjemahan "
+"tidak tersedia, maka masukan pada baris berikutnya yang akan digunakan."
 
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
 msgid "Modem Configuration"
@@ -207,11 +214,11 @@ msgstr ""
 
 #: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
-msgstr ""
+msgstr "Nama Pengguna:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
-msgstr ""
+msgstr "Kata Sandi:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
@@ -238,43 +245,45 @@ msgstr ""
 #: ../extensions/cpsection/network/__init__.py:21
 #: ../extensions/cpsection/network/view.py:29
 msgid "Network"
-msgstr ""
+msgstr "Jaringan"
 
 #: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
-msgstr ""
+msgstr "Keadaan tak diketahui."
 
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
-msgstr ""
+msgstr "Kesalahan dalam argumen radio yang ditentukan menggunakan on/off."
 
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
-msgstr ""
+msgstr "Kesalahan dalam argumen yang ditentukan menggunakan 0/1."
 
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
-msgstr ""
+msgstr "Nirkabel"
 
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
-msgstr ""
+msgstr "Matikan perangkat nirkabel untuk menghemat daya baterai"
 
 #: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
+"Bersihkan sejarah jaringan jika Anda mengalami kesulitan untuk menghubungkan "
+"jaringan"
 
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
-msgstr ""
+msgstr "Bersihkan sejarah jaringan"
 
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
-msgstr ""
+msgstr "Kerja Sama"
 
 #: ../extensions/cpsection/network/view.py:130
 msgid ""
@@ -282,30 +291,33 @@ msgid ""
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
+"Servernya sama dengan dimana anda berada; orang-orang pada server yang sama "
+"akan dapat saling bertemu, bahkan ketika mereka tidak berada pada jaringan "
+"yang sama."
 
 #: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
-msgstr ""
+msgstr "Server:"
 
 #: ../extensions/cpsection/power/__init__.py:21
 msgid "Power"
-msgstr ""
+msgstr "Daya"
 
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
-msgstr ""
+msgstr "Kesalahan ditemui ketika mengotomatisasi argumen md. gunakan on/off."
 
 #: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
-msgstr ""
+msgstr "Kesalahan ditemui dalam argumen md ekstrim. gunakan on/off."
 
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
-msgstr ""
+msgstr "Manajemen daya"
 
 #: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
-msgstr ""
+msgstr "Manajemen daya otomatis (meningkatkan ketahanan baterai)"
 
 #: ../extensions/cpsection/power/view.py:86
 msgid ""
@@ -314,143 +326,143 @@ msgstr ""
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
-msgstr ""
+msgstr "Pembaruan perangkat lunak"
 
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
+"Pembaruan perangkat lunak ditujukan untuk memperbaiki kesalahan, "
+"menghilangkan kelemahan keamanan, dan menyediakan beberapa fitur baru."
 
 #: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
-msgstr ""
+msgstr "Memeriksa %s..."
 
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
-msgstr ""
+msgstr "Mengunduh %s..."
 
 #: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
-msgstr ""
+msgstr "Memperbaharui %s..."
 
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
-msgstr ""
+msgstr "Perangkat lunak anda sudah dalam kondisi paling baru"
 
 #: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Anda dapat memasangkan pembaruan %s"
 
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
-msgstr ""
+msgstr "Memeriksa pembaruan..."
 
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
-msgstr ""
+msgstr "Memasangkan pembaruan..."
 
 #: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "pembaruan %s sudah dipasangkan"
 
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
-msgstr ""
+msgstr "Pasangkan yang dipilih"
 
 #: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Ukuran unduhan: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
 #, python-format
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
+msgstr "Dari versi %(current)s ke %(new)s (Ukuran: %(size)s)"
 
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
 msgid "None"
-msgstr ""
+msgstr "Tidak ada"
 
 #. TRANS: download size of very small updates
 #: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
-msgstr ""
+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 ""
+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 ""
+msgstr "%.1f MB"
 
 #: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
-msgstr ""
+msgstr "Baterai Ku"
 
 #: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
-msgstr ""
+msgstr "Dihapuskan"
 
 #: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
-msgstr ""
+msgstr "Mengisi"
 
 #: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
-msgstr ""
+msgstr "Daya yang tersedia sangat sedikit"
 
 #: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
-msgstr ""
+msgstr "%(hour)d:%(min).2d tersisa"
 
 #: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
-msgstr ""
+msgstr "Terisi"
 
 #: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
-msgstr ""
+msgstr "Alamat IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
-msgstr ""
+msgstr "Putuskan"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
-msgstr ""
+msgstr "Menghubungkan..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
-msgstr ""
+msgstr "Terhubung"
 
 #: ../extensions/deviceicon/network.py:130
 msgid "No wireless connection"
@@ -458,15 +470,15 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
-msgstr ""
+msgstr "Kanal"
 
 #: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
-msgstr ""
+msgstr "Jaringan Kabel"
 
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
-msgstr ""
+msgstr "Kecepatan"
 
 #: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
@@ -474,18 +486,19 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:281
 msgid "Please wait..."
-msgstr ""
+msgstr "Silakan tunggu..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
-msgstr ""
+msgstr "Koneksikan"
 
 #: ../extensions/deviceicon/network.py:287
+#, fuzzy
 msgid "Disconnected"
-msgstr ""
+msgstr "Putuskan"
 
 #: ../extensions/deviceicon/network.py:294
 #: ../src/jarabe/controlpanel/toolbar.py:119
@@ -494,7 +507,7 @@ msgstr ""
 #: ../src/jarabe/frame/activitiestray.py:704
 #: ../src/jarabe/frame/activitiestray.py:732
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #: ../extensions/deviceicon/network.py:333
 msgid "Try connection again"
@@ -503,12 +516,12 @@ msgstr ""
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Kesalahan: %s"
 
 #: ../extensions/deviceicon/network.py:340
 #, python-format
 msgid "Suggestion: %s"
-msgstr ""
+msgstr "Saran: %s"
 
 #: ../extensions/deviceicon/network.py:349
 #, python-format
@@ -519,7 +532,7 @@ msgstr ""
 #: ../extensions/deviceicon/network.py:356
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
@@ -537,34 +550,34 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
 #: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
-msgstr ""
+msgstr "Speaker Ku"
 
 #: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
-msgstr ""
+msgstr "Bersuara"
 
 #: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
-msgstr ""
+msgstr "Bisu"
 
 #: ../extensions/deviceicon/touchpad.py:38
 msgid "finger"
@@ -580,31 +593,31 @@ msgstr ""
 
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
-msgstr ""
+msgstr "Bertaut"
 
 #: ../extensions/globalkey/screenshot.py:61
 #: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
-msgstr ""
+msgstr "Kelompok"
 
 #: ../extensions/globalkey/screenshot.py:63
 #: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
-msgstr ""
+msgstr "Rumah"
 
 #: ../extensions/globalkey/screenshot.py:69
 #: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
-msgstr ""
+msgstr "Aktivitas"
 
 #: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
-msgstr ""
+msgstr "Tangkapan"
 
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
-msgstr ""
+msgstr "Tangkapan dari \"%s\""
 
 #: ../data/sugar.schemas.in.h:1
 msgid ""
@@ -618,7 +631,7 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
-msgstr ""
+msgstr "URL Cadangan"
 
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
@@ -630,10 +643,13 @@ msgid ""
 "composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
+"Warna untuk aikon XO yang digunakan pada destop. Temali yang digunakan "
+"merupakan komposisi dari warna garis dan isi, menggunakan format warna rgb. "
+"Contohnya: #AC32FF,#9A5200"
 
 #: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
-msgstr ""
+msgstr "Waktu Tunda Pojok"
 
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
@@ -649,11 +665,11 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr ""
+msgstr "Waktu tunda untuk aktivasi bingkai yang menggunakan pojok."
 
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
-msgstr ""
+msgstr "Waktu tunda untuk aktivasi frame menggunakan sisi-sisinya."
 
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
@@ -661,23 +677,25 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
-msgstr ""
+msgstr "Waktu Tunda Sisi"
 
 #: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
-msgstr ""
+msgstr "Tatanan Kesukaan"
 
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
-msgstr ""
+msgstr "Modus kembali kesukaan"
 
 #: ../data/sugar.schemas.in.h:16
+#, fuzzy
 msgid "Font face that is used throughout the desktop."
-msgstr ""
+msgstr "Nama pengguna yang akan digunakan melalui destop."
 
 #: ../data/sugar.schemas.in.h:17
+#, fuzzy
 msgid "Font size that is used throughout the desktop."
-msgstr ""
+msgstr "Nama pengguna yang akan digunakan melalui destop."
 
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
@@ -732,14 +750,17 @@ msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
+"Jika BENAR, Sugar akan membuat kita dapat ditemukan oleh pengguna lain di "
+"server Jabber."
 
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
+msgstr "Jika BENAR, Sugar akan menampilkan pilihan \"Keluar\"."
 
 #: ../data/sugar.schemas.in.h:32
+#, fuzzy
 msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
+msgstr "Jika BENAR, Sugar akan menampilkan pilihan \"Keluar\"."
 
 #: ../data/sugar.schemas.in.h:33
 msgid ""
@@ -750,60 +771,62 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
-msgstr ""
+msgstr "Server Jabber"
 
 #: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
-msgstr ""
+msgstr "Tatanan papan ketikan"
 
 #: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
-msgstr ""
+msgstr "Model papan ketikan"
 
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
-msgstr ""
+msgstr "Pilihan untuk papan ketikan"
 
 #: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
-msgstr ""
+msgstr "Tatanan untuk penampilan kesukaan."
 
 #: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
+"Daftar dari beberapa tatanan papan ketik. tiap masukan harus dalam susunan "
+"tantanan (varian)"
 
 #: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
-msgstr ""
+msgstr "Daftar pilihan dari papan ketikan."
 
 #: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
-msgstr ""
+msgstr "Daya Otomatis"
 
 #: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
-msgstr ""
+msgstr "Daya Otomatis."
 
 #: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
-msgstr ""
+msgstr "Daya Ekstrim"
 
 #: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
-msgstr ""
+msgstr "Daya Ekstrim."
 
 #: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
-msgstr ""
+msgstr "Publikasikan ke Gadget"
 
 #: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
-msgstr ""
+msgstr "Setelan untuk membisukan perangkat suara."
 
 #: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
-msgstr ""
+msgstr "Perlihatkan \"Keluar\""
 
 #: ../data/sugar.schemas.in.h:48
 msgid "Show Restart"
@@ -815,35 +838,35 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
-msgstr ""
+msgstr "Suara dibisukan"
 
 #: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
-msgstr ""
+msgstr "Model papan ketik yang akan digunakan"
 
 #: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
-msgstr ""
+msgstr "Setelan zona waktu untuk sistem."
 
 #: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
-msgstr ""
+msgstr "Url dari server jabber yang akan digunakan."
 
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
-msgstr ""
+msgstr "Url dimana cadangan akan disimpankan."
 
 #: ../data/sugar.schemas.in.h:56
 msgid "User Color"
-msgstr ""
+msgstr "Warna Pengguna"
 
 #: ../data/sugar.schemas.in.h:57
 msgid "User Name"
-msgstr ""
+msgstr "Nama Pengguna"
 
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
-msgstr ""
+msgstr "Nama pengguna yang akan digunakan melalui destop."
 
 #: ../data/sugar.schemas.in.h:59
 msgid ""
@@ -852,17 +875,19 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
-msgstr ""
+msgstr "Tingkat Volume"
 
 #: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
-msgstr ""
+msgstr "Tingkat volume dari perangkat suara."
 
 #: ../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 ""
+"Ketika dalam mode pengembalian, klik pada aikon yang disuka akan menyebabkan "
+"masukan terakhir pada aktivitas tersebut akan dikembalikan."
 
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
@@ -870,16 +895,18 @@ msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
+"sugar-control-panel: PERINGATAN, ditemukan lebih dari satu pilihan dengan "
+"nama yang sama: %s modul: %r"
 
 #: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
-msgstr ""
+msgstr "sugar-control-panel: kunci=%s tidak tersedia dalam pilihan yang ada"
 
 #: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
-msgstr ""
+msgstr "sugar-control-panel: %s"
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
@@ -896,123 +923,135 @@ msgid ""
 "    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
+"Penggunaan: sugar-control-panel [ pilihan ] kunci [ argumen ... ] \n"
+"Mengendalikan lingkungan kerja sugar. \n"
+"    Pilihan: \n"
+"    -h            memperlihatkan pesan bantuan ini dan keluar \n"
+"    -l             daftar dari semua pilihan yang ada \n"
+"    -h kunci       memperlihatkan informasi mengenai kunci ini \n"
+"    -g kunci       mendapatkan isi daripada kunci \n"
+"    -s kunci       menentukan isi untuk kunci ini \n"
+"    -c kunci       membersihkan isi kunci \n"
+"    "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
-msgstr ""
+msgstr "Untuk mendapatkan perubahan yang ada anda diharuskan memulai ulang sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
-msgstr ""
+msgstr "Peringatan"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
-msgstr ""
+msgstr "Perubahan membutuhkan pemulain ulang"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
-msgstr ""
+msgstr "Batalkan perubahan"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
-msgstr ""
+msgstr "Nanti"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
-msgstr ""
+msgstr "Mulai ulang sekarang"
 
 #: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
-msgstr ""
+msgstr "Selesai"
 
 #: ../src/jarabe/controlpanel/toolbar.py:125
 #: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
-msgstr ""
+msgstr "Versi %s"
 
 #: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
-msgstr ""
+msgstr "Konfirmasikan penghapusan"
 
 #: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
+"Konfirmasikan penghapusan: Apakah anda yakin untuk secara permanen "
+"menghapuskan %s?"
 
 #: ../src/jarabe/desktop/activitieslist.py:362
 #: ../src/jarabe/frame/clipboardmenu.py:67
 #: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
-msgstr ""
+msgstr "Simpan"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
-msgstr ""
+msgstr "Hapus"
 
 #: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
-msgstr ""
+msgstr "Hilangkan kesukaan"
 
 #: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
-msgstr ""
+msgstr "Buat jadi kesukaan"
 
 #. TRANS: label for the freeform layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
-msgstr ""
+msgstr "Freeform"
 
 #. TRANS: label for the ring layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
-msgstr ""
+msgstr "Melingkar"
 
 #. TRANS: label for the spiral layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
-msgstr ""
+msgstr "Spiral"
 
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
-msgstr ""
+msgstr "Kotak"
 
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
-msgstr ""
+msgstr "Segi tiga"
 
 #: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
-msgstr ""
+msgstr "Pendaftaran Gagal"
 
 #: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
-msgstr ""
+msgstr "Pendaftaran Berhasil"
 
 #: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
-msgstr ""
+msgstr "Sekarang anda terdaftar di server sekolah anda."
 
 #: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
-msgstr ""
+msgstr "Daftarkan"
 
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
@@ -1021,123 +1060,133 @@ msgstr ""
 
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
-msgstr ""
+msgstr "Pembaruan Perangkat Lunak"
 
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
+"Perbarui aktivitas anda untuk memastikan kompatibilitasnya dengan perangkat "
+"lunak baru anda"
 
 #: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
-msgstr ""
+msgstr "Periksa sekarang"
 
 #: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
-msgstr ""
+msgstr "Tampilan daftar"
 
 #: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
-msgstr ""
+msgstr "<Ctrl>2"
 
 #: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
-msgstr ""
+msgstr "Tampilan kesukaan"
 
 #: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
-msgstr ""
+msgstr "Jenis Kunci:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
-msgstr ""
+msgstr "Jenis Otentikasi:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
-msgstr ""
+msgstr "WPA & WPA2 Pribadi"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
-msgstr ""
+msgstr "Keamanan Nirkabel:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
-msgstr ""
+msgstr "Kembali"
 
 #: ../src/jarabe/desktop/meshbox.py:96
 #: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
-msgstr ""
+msgstr "Bergabung"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr ""
 
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
-msgstr ""
+msgstr "Tidak dapat terhubung ke server."
 
 #: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
-msgstr ""
+msgstr "Servernya tidak dapat menyelesaikan permintaan anda."
 
 #: ../src/jarabe/frame/activitiestray.py:187
 #: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
-msgstr ""
+msgstr "Tolak"
 
 #: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
-msgstr ""
+msgstr "%dB"
 
 #: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
-msgstr ""
+msgstr "%dKB"
 
 #: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
-msgstr ""
+msgstr "%dMB"
 
 #: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
-msgstr ""
+msgstr "%s dari %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
+#, python-format,
 msgid "Transfer from %s"
-msgstr ""
+msgstr "Transfer dari %s"
 
 #: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
-msgstr ""
+msgstr "Terima"
 
 #: ../src/jarabe/frame/activitiestray.py:592
 #: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../src/jarabe/frame/activitiestray.py:626
 #: ../src/jarabe/frame/activitiestray.py:639
 #: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
-msgstr ""
+msgstr "Bubar"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
@@ -1145,214 +1194,217 @@ msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
+#, python-format,
 msgid "Transfer to %s"
-msgstr ""
+msgstr "Transfer ke %s"
 
 #: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
-msgstr ""
+msgstr "Dihapuskan"
 
 #: ../src/jarabe/frame/clipboardmenu.py:62
 #: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
-msgstr ""
+msgstr "Buka"
 
 #: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
-msgstr ""
+msgstr "Buka dengan"
 
 #: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
-msgstr ""
+msgstr "Kliping %s"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
-msgstr ""
+msgstr "Lingkungan sekitar"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
-msgstr ""
+msgstr "F2"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
-msgstr ""
+msgstr "F3"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
-msgstr ""
+msgstr "F4"
 
 #: ../src/jarabe/intro/window.py:90
 msgid "Name:"
-msgstr ""
+msgstr "Nama:"
 
 #: ../src/jarabe/intro/window.py:126
+#, fuzzy
 msgid "Click to change color:"
-msgstr ""
+msgstr "Klik untuk mengubah warna anda:"
 
 #: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
-msgstr ""
+msgstr "Kembali"
 
 #: ../src/jarabe/intro/window.py:204
 msgid "Next"
-msgstr ""
+msgstr "Selanjutnya"
 
 #: ../src/jarabe/journal/expandedentry.py:156
 #: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
 #: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
-msgstr ""
+msgstr "Tak bernama"
 
 #: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
-msgstr ""
+msgstr "Tidak ada penampakan"
 
 #: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
-msgstr ""
+msgstr "Jenis: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:264
 #: ../src/jarabe/journal/listmodel.py:150
 #: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
-msgstr ""
+msgstr "Tidak diketahui"
 
 #: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
-msgstr ""
+msgstr "Tanggal: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
-msgstr ""
+msgstr "Ukuran: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:294
 #: ../src/jarabe/journal/misc.py:108
 msgid "No date"
-msgstr ""
+msgstr "Tidak bertanggal"
 
 #: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
-msgstr ""
+msgstr "Para Peserta:"
 
 #: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
-msgstr ""
+msgstr "Keterangan:"
 
 #: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
-msgstr ""
+msgstr "Penanda:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
-msgstr ""
+msgstr "Catatan"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
-msgstr ""
+msgstr "Cari"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
-msgstr ""
+msgstr "Setiap saat"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
-msgstr ""
+msgstr "Hari ini"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
-msgstr ""
+msgstr "Sejak kemarin"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
-msgstr ""
+msgstr "Minggu yang lalu"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
-msgstr ""
+msgstr "Bulan yang lalu"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
-msgstr ""
+msgstr "Tahun yang lalu"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
-msgstr ""
+msgstr "Setiap orang"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
-msgstr ""
+msgstr "Teman-teman ku"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
-msgstr ""
+msgstr "Kelas ku"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
-msgstr ""
+msgstr "Apa saja"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
-msgstr ""
+msgstr "Salin ke"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
-msgstr ""
+msgstr "Kesalahan"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
-msgstr ""
+msgstr "Mulai"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
 #: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
-msgstr ""
+msgstr "Jurnal anda kosong"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
@@ -1364,11 +1416,11 @@ msgstr ""
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
-msgstr ""
+msgstr "Tidak ada masukan yang cocok"
 
 #: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
-msgstr ""
+msgstr "Bersihkan pencarian"
 
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
@@ -1382,44 +1434,46 @@ msgstr ""
 
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
-msgstr ""
+msgstr "Jurnal anda penuh"
 
 #: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
+"Silahkan hapus beberapa masukan lama pada jurnal agar yang baru mendapatkan "
+"tempat."
 
 #: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
-msgstr ""
+msgstr "Perlihatkan Jurnal"
 
 #: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
-msgstr ""
+msgstr "Pilih sebuah objek"
 
 #: ../src/jarabe/journal/objectchooser.py:151
 #: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
-msgstr ""
+msgstr "Tutup"
 
 #: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
-msgstr ""
+msgstr "Kembali dengan"
 
 #: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
-msgstr ""
+msgstr "Mulai dengan"
 
 #: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
 msgid "No activity to start entry"
-msgstr ""
+msgstr "Tidak ada aktivitas untuk memulai masukan"
 
 #: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
-msgstr ""
+msgstr "Kirimkan ke"
 
 #: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
-msgstr ""
+msgstr "Selengkapnya"
 
 #: ../src/jarabe/journal/palettes.py:160
 msgid "Entries without a file cannot be sent."
@@ -1436,15 +1490,15 @@ msgstr ""
 
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
-msgstr ""
+msgstr "Tidak ada teman-teman"
 
 #: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
-msgstr ""
+msgstr "Tidak ada koneksi untuk ditemukan"
 
 #: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
-msgstr ""
+msgstr "Tidak ada aktivitas untuk mengembalikan masukan"
 
 #: ../src/jarabe/journal/volumestoolbar.py:209
 msgid "Documents"
@@ -1454,7 +1508,7 @@ msgstr ""
 #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
 msgid "%(free_space)d MB Free"
-msgstr ""
+msgstr "%(free_space)d MB Tersedia"
 
 #: ../src/jarabe/model/network.py:163
 msgid "The reason for the device state change is unknown."
@@ -1625,15 +1679,15 @@ msgstr ""
 
 #: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
-msgstr ""
+msgstr "Hapuskan teman"
 
 #: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
-msgstr ""
+msgstr "Jadikan teman"
 
 #: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
-msgstr ""
+msgstr "Matikan"
 
 #: ../src/jarabe/view/buddymenu.py:95
 msgid "Restart"
@@ -1641,16 +1695,16 @@ msgstr ""
 
 #: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
-msgstr ""
+msgstr "Keluar"
 
 #: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
-msgstr ""
+msgstr "Setelan ku"
 
 #: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
-msgstr ""
+msgstr "Undang ke %s"
 
 #: ../src/jarabe/view/launcher.py:145
 #, python-format
@@ -1659,7 +1713,7 @@ msgstr ""
 
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
-msgstr ""
+msgstr "Memulai..."
 
 #: ../src/jarabe/view/palettes.py:58
 msgid "Activity failed to start"
@@ -1668,36 +1722,37 @@ msgstr ""
 #. TODO: share-with, keep
 #: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
-msgstr ""
+msgstr "Lihat Sumbernya"
 
 #: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
-msgstr ""
+msgstr "Hentikan"
 
 #: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
-msgstr ""
+msgstr "Mulai yang baru"
 
 #: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
-msgstr ""
+msgstr "Lihat isinya"
 
 #: ../src/jarabe/view/palettes.py:229
+#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
-msgstr ""
+msgstr "Dihapuskan"
 
 #: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
-msgstr ""
+msgstr "Sumber Instan"
 
 #: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
-msgstr ""
+msgstr "Sumber"
 
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
-msgstr ""
+msgstr "Sumber Paket Aktivitas"
 
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
@@ -1706,7 +1761,7 @@ msgstr ""
 #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
-msgstr ""
+msgstr "Lihat sumber: %r"
 
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
diff --git a/po/it.po b/po/it.po
index 1e78379..502b49f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ 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: 2011-09-28 18:56+0200\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-04-02 06:55+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
@@ -69,48 +69,48 @@ msgstr "Seleziona per cambiare il tuo colore:"
 msgid "About my Computer"
 msgstr "Il mio Computer"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Non disponibile"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identità"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Numero di Serie:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Build:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Wireless Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Copyright e Licenza"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -122,7 +122,7 @@ msgstr ""
 "chiunque è il benvenuto per apportare modifiche e migliorie e/o distribuirne "
 "copie, alle condizioni descritte nella licenza medesima."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Testo della Licenza:"
 
@@ -462,31 +462,32 @@ msgstr "Indirizzo IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Disconnetti"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Connessione..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Connesso"
 
 #: ../extensions/deviceicon/network.py:130
+#, fuzzy
 msgid "No wireless connection"
-msgstr ""
+msgstr "Nessuna connessione wireless"
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
@@ -509,9 +510,9 @@ msgid "Please wait..."
 msgstr "Attendi..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Connetti"
 
@@ -570,21 +571,21 @@ msgid "Check your configuration."
 msgstr "Verifica la configurazione."
 
 # A complete translation in italian: "rete a maglie" becames a tautology
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Rete Mesh"
 
 # A complete translation in italian: "rete a maglie" becames a tautology
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Rete Mesh %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Connessione GSM non disponibile."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Definisci una connessione nel Pannello di Controllo."
 
@@ -968,26 +969,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Per applicare le modifiche è necessario riavviare sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Attenzione"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Le modifiche rendono necessario un riavvio"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Annulla modifiche"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Dopo"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Riavvia adesso"
 
@@ -1027,7 +1028,7 @@ msgstr "Memorizza"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Elimina"
@@ -1093,8 +1094,9 @@ msgstr "Registra"
 
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
+#, fuzzy
 msgid "Register again"
-msgstr ""
+msgstr "Registra ancora"
 
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
@@ -1126,26 +1128,33 @@ msgstr "Visualizza i Preferiti"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tipo Chiave:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tipo di Autenticazione:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Wireless Security:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Riprendi"
@@ -1155,13 +1164,13 @@ msgstr "Riprendi"
 msgid "Join"
 msgstr "Associa"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Rete Ad-hoc %d"
 
 # A complete translation in italian: "rete a maglie" becames a tautology
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Rete Mesh %d"
@@ -1200,7 +1209,8 @@ msgid "%s of %s"
 msgstr "%s di %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer from %s"
 msgstr "Trasferisci da %s"
 
@@ -1221,11 +1231,13 @@ msgid "Dismiss"
 msgstr "Abbandona"
 
 #: ../src/jarabe/frame/activitiestray.py:643
+#, fuzzy
 msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "L'altro partecipante ha annullato il trasferimento di file"
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer to %s"
 msgstr "Trasferisci verso %s"
 
@@ -1335,81 +1347,82 @@ msgid "Tags:"
 msgstr "Etichette:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Diario"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Cerca"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Sempre"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Oggi"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Da ieri"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Settimana scorsa"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Mese scorso"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Anno scorso"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Tutti"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "I miei amici"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "La mia classe"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Qualsiasi"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
+#, fuzzy
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplica"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Errore durante la copia dell'elemento. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1417,38 +1430,44 @@ msgstr "Errore"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Avvia"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
+#, fuzzy
 msgid "Sort by date modified"
-msgstr ""
+msgstr "Ordinato per data di modifica"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
+#, fuzzy
 msgid "Sort by date created"
-msgstr ""
+msgstr "Ordinato per data di creazione"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
+#, fuzzy
 msgid "Sort by size"
-msgstr ""
+msgstr "Ordinato per dimensione"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
+#, fuzzy
 msgid "Sort view"
-msgstr ""
+msgstr "Vista per ordinamento"
 
 #: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr "Il tuo Diario è vuoto"
 
 #: ../src/jarabe/journal/listview.py:319
+#, fuzzy
 msgid "Your documents folder is empty"
-msgstr ""
+msgstr "La cartella documenti è vuota"
 
 #: ../src/jarabe/journal/listview.py:321
+#, fuzzy
 msgid "The device is empty"
-msgstr ""
+msgstr "Il dispositivo è vuoto"
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
@@ -1460,13 +1479,15 @@ msgstr "Annulla ricerca"
 
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
+#, python-format, fuzzy
 msgid "Older Version Of %s Activity"
-msgstr ""
+msgstr "Versione precedente di %s attività"
 
 #: ../src/jarabe/journal/misc.py:274
 #, python-format
+#, python-format, fuzzy
 msgid "Do you want to downgrade to version %s"
-msgstr ""
+msgstr "Voi ritornare alla versione %s"
 
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
@@ -1512,9 +1533,8 @@ msgid "View Details"
 msgstr "Visualizza Dettagli"
 
 #: ../src/jarabe/journal/palettes.py:160
-#, fuzzy
 msgid "Entries without a file cannot be sent."
-msgstr "Elementi senza file non possono essere copiati"
+msgstr "Elementi senza file non possono essere inviato."
 
 #: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
 #: ../src/jarabe/journal/volumestoolbar.py:306
@@ -1523,7 +1543,7 @@ msgstr "Elementi senza file non possono essere copiati"
 
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
-msgstr ""
+msgstr "Cartella appunti"
 
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
@@ -1549,171 +1569,218 @@ msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d MB Liberi"
 
 #: ../src/jarabe/model/network.py:163
+#, fuzzy
 msgid "The reason for the device state change is unknown."
-msgstr ""
+msgstr "La ragione per il cambiamento di stato del dispositivo è sconosciuta."
 
 #: ../src/jarabe/model/network.py:165
 msgid "The state change is normal."
 msgstr "Il cambiamento di stato è normale."
 
 #: ../src/jarabe/model/network.py:167
+#, fuzzy
 msgid "The device is now managed."
-msgstr ""
+msgstr "Il dispositivo è ora gestito."
 
 #: ../src/jarabe/model/network.py:169
+#, fuzzy
 msgid "The device is no longer managed."
-msgstr ""
+msgstr "Il dispositivo non è più gestito."
 
 #: ../src/jarabe/model/network.py:171
+#, fuzzy
 msgid "The device could not be readied for configuration."
-msgstr ""
+msgstr "Il dispositivo non può essere pronto per la configurazione."
 
 #: ../src/jarabe/model/network.py:173
+#, fuzzy
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc)."
 msgstr ""
+"La configurazione IP non può essere riservata (indirizzo non disponibile, "
+"timeout, ecc)."
 
 #: ../src/jarabe/model/network.py:176
+#, fuzzy
 msgid "The IP configuration is no longer valid."
-msgstr ""
+msgstr "La configurazione IP non è più valida."
 
 #: ../src/jarabe/model/network.py:178
+#, fuzzy
 msgid "Secrets were required, but not provided."
-msgstr ""
+msgstr "Sono state richieste informazioni riservate, ma non sono state fornite."
 
 #: ../src/jarabe/model/network.py:180
+#, fuzzy
 msgid ""
 "The 802.1X supplicant disconnected from the access point or authentication "
 "server."
 msgstr ""
+"Il richiedente 802.1X è stato disconnesso dal punto di accesso o dal server "
+"di autenticazione."
 
 #: ../src/jarabe/model/network.py:183
+#, fuzzy
 msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
+msgstr "La configurazione del richiedente 802.1X è fallita."
 
 #: ../src/jarabe/model/network.py:185
+#, fuzzy
 msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
+msgstr "Il richiedente 802.1X si è chiuso o ha fallito in modo imprevisto."
 
 #: ../src/jarabe/model/network.py:187
+#, fuzzy
 msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
+msgstr "Il richiedente 802.1X ha richiesto troppo tempo per l'autenticazione."
 
 #: ../src/jarabe/model/network.py:189
+#, fuzzy
 msgid "The PPP service failed to start within the allowed time."
-msgstr ""
+msgstr "Il servizio PPP non si è attivato nel tempo stabilito."
 
 #: ../src/jarabe/model/network.py:191
+#, fuzzy
 msgid "The PPP service disconnected unexpectedly."
-msgstr ""
+msgstr "Il servizio PPP si è disconnesso in modo imprevisto."
 
 #: ../src/jarabe/model/network.py:193
+#, fuzzy
 msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
+msgstr "Il servizio PPP è terminato o mancato in modo imprevisto."
 
 #: ../src/jarabe/model/network.py:195
+#, fuzzy
 msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
+msgstr "Il servizio DHCP non si è attivato nel tempo stabilito."
 
 #: ../src/jarabe/model/network.py:197
+#, fuzzy
 msgid "The DHCP service reported an unexpected error."
-msgstr ""
+msgstr "Il servizio DHCP ha riportato un errore imprevisto."
 
 #: ../src/jarabe/model/network.py:199
+#, fuzzy
 msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
+msgstr "Il servizio DHCP è terminato o mancato in modo imprevisto."
 
 #: ../src/jarabe/model/network.py:201
+#, fuzzy
 msgid "The shared connection service failed to start."
-msgstr ""
+msgstr "Il servizio di connessione condivisa non si è attivato."
 
 #: ../src/jarabe/model/network.py:203
+#, fuzzy
 msgid "The shared connection service quit or failed unexpectedly."
 msgstr ""
+"Il servizio di connessione condivisa è terminato o mancato in modo "
+"imprevisto."
 
 #: ../src/jarabe/model/network.py:206
+#, fuzzy
 msgid "The AutoIP service failed to start."
-msgstr ""
+msgstr "Il servizio AutoIP non si è attivato."
 
 #: ../src/jarabe/model/network.py:208
+#, fuzzy
 msgid "The AutoIP service reported an unexpected error."
-msgstr ""
+msgstr "Il servizio AutoIP ha riportato un errore imprevisto."
 
 #: ../src/jarabe/model/network.py:210
+#, fuzzy
 msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
+msgstr "Il servizio AutoIP è terminato o mancato in modo imprevisto."
 
 #: ../src/jarabe/model/network.py:212
+#, fuzzy
 msgid "Dialing failed because the line was busy."
-msgstr ""
+msgstr "La composizione del numero è fallita perché la linea era occupata."
 
 #: ../src/jarabe/model/network.py:214
+#, fuzzy
 msgid "Dialing failed because there was no dial tone."
 msgstr ""
+"La composizione del numero è fallita perché non c'era il segnale di linea."
 
 #: ../src/jarabe/model/network.py:216
+#, fuzzy
 msgid "Dialing failed because there was no carrier."
-msgstr ""
+msgstr "La composizione del numero è fallita perché non c'era la linea."
 
 #: ../src/jarabe/model/network.py:218
+#, fuzzy
 msgid "Dialing timed out."
-msgstr ""
+msgstr "Tempo scaduto per comporre il numero."
 
 #: ../src/jarabe/model/network.py:220
+#, fuzzy
 msgid "Dialing failed."
-msgstr ""
+msgstr "Composizione del numero fallita."
 
 #: ../src/jarabe/model/network.py:222
+#, fuzzy
 msgid "Modem initialization failed."
-msgstr ""
+msgstr "Inizializzazione del modem fallita."
 
 #: ../src/jarabe/model/network.py:224
+#, fuzzy
 msgid "Failed to select the specified GSM APN"
-msgstr ""
+msgstr "La selezione di GSM APN specificato è fallita"
 
 #: ../src/jarabe/model/network.py:226
+#, fuzzy
 msgid "Not searching for networks."
-msgstr ""
+msgstr "Ricerca di reti inattiva."
 
 #: ../src/jarabe/model/network.py:228
+#, fuzzy
 msgid "Network registration was denied."
-msgstr ""
+msgstr "Registrazione alla rete negata."
 
 #: ../src/jarabe/model/network.py:230
+#, fuzzy
 msgid "Network registration timed out."
-msgstr ""
+msgstr "Registrazione alla rete scaduta."
 
 #: ../src/jarabe/model/network.py:232
+#, fuzzy
 msgid "Failed to register with the requested GSM network."
-msgstr ""
+msgstr "La registrazione alla rete GSM richiesta è fallita"
 
 #: ../src/jarabe/model/network.py:234
+#, fuzzy
 msgid "PIN check failed."
-msgstr ""
+msgstr "Controllo del PIN respinto."
 
 #: ../src/jarabe/model/network.py:236
+#, fuzzy
 msgid "Necessary firmware for the device may be missing."
-msgstr ""
+msgstr "Firmware per il dispositivo mancante."
 
 #: ../src/jarabe/model/network.py:238
+#, fuzzy
 msgid "The device was removed."
-msgstr ""
+msgstr "Il dispositivo è stato rimosso."
 
 #: ../src/jarabe/model/network.py:240
+#, fuzzy
 msgid "NetworkManager went to sleep."
-msgstr ""
+msgstr "NetworkManager è in pausa."
 
 #: ../src/jarabe/model/network.py:242
+#, fuzzy
 msgid "The device's active connection was removed or disappeared."
-msgstr ""
+msgstr "La connessione attiva del dispositivo è stata rimossa o è scomparsa."
 
 #: ../src/jarabe/model/network.py:245
+#, fuzzy
 msgid "A user or client requested the disconnection."
-msgstr ""
+msgstr "Disconnessione richiesta dall'utente."
 
 #: ../src/jarabe/model/network.py:247
+#, fuzzy
 msgid "The device's carrier/link changed."
-msgstr ""
+msgstr "Il collegamento del dispositivo è cambiato."
 
 #: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
@@ -1746,16 +1813,18 @@ msgstr "Invito per %s"
 
 #: ../src/jarabe/view/launcher.py:145
 #, python-format
+#, python-format, fuzzy
 msgid "<b>%s</b> failed to start."
-msgstr ""
+msgstr "<b>%s</b> non è riuscito ad avviarsi."
 
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr "Inizio..."
 
 #: ../src/jarabe/view/palettes.py:58
+#, fuzzy
 msgid "Activity failed to start"
-msgstr ""
+msgstr "L'attività ha fallito l'avvio"
 
 #. TODO: share-with, keep
 #: ../src/jarabe/view/palettes.py:91
@@ -1793,8 +1862,9 @@ msgid "Activity Bundle Source"
 msgstr "Sorgente della Attività"
 
 #: ../src/jarabe/view/viewsource.py:393
+#, fuzzy
 msgid "Sugar Toolkit Source"
-msgstr ""
+msgstr "Sorgente della Sugar Toolkit"
 
 #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
@@ -1802,8 +1872,9 @@ msgid "View source: %r"
 msgstr "Vedi codice sorgente: %r"
 
 #: ../src/jarabe/util/emulator.py:40
+#, fuzzy
 msgid "Sugar in a window"
-msgstr ""
+msgstr "Sugar in una finestra"
 
 # Only show disconnect when there's a mesh device, because mesh takes
 # priority over the normal wireless device.  NM doesn't have a "disconnect"
diff --git a/po/ja.po b/po/ja.po
index fdf7162..e16dc5c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,16 +6,16 @@ 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: 2010-03-23 06:29+0200\n"
-"Last-Translator: korakurider <korakurider@gmail.com>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-01-20 07:12+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.3\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
@@ -61,48 +61,48 @@ msgstr "クリックして色を変更:"
 msgid "About my Computer"
 msgstr "私のコンピュータについて"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "不明です"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "個体の識別"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "シリアル番号:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "ソフトウェア"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "ビルド:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "ファームウェア:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "ワイヤレスファームウェア:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "著作権とライセンス"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -112,7 +112,7 @@ msgstr ""
 "Sugarは、あなたが見ているグラフィカルユーザインターフェースです。Sugarはフリーソフトウェアで、GNU General Public Licen"
 "se（一般公衆利用許諾契約書）による保護対象です。ここに記載されている条件の範囲で、Sugarを変更したりコピーを配布することが自由に行えます。"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "ライセンス全文:"
 
@@ -333,7 +333,7 @@ msgstr "%s を調べています..."
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
-msgstr "% をダウンロードしています..."
+msgstr "%s をダウンロードしています..."
 
 #: ../extensions/cpsection/updater/view.py:129
 #, python-format
@@ -362,7 +362,7 @@ msgstr "更新をインストールしています..."
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
-msgstr[0] "％ｓ の更新がインストールされました"
+msgstr[0] "%s の更新がインストールされました"
 
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
@@ -374,8 +374,8 @@ msgid "Download size: %s"
 msgstr "ダウンロードのサイズ: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
-#, python-format, 
 #, python-format
+#, python-format,
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr "現在のバージョン %(current)s から %(new)s (サイズ: %(size)s) へ"
 
@@ -433,8 +433,8 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "切断"
 
@@ -444,18 +444,18 @@ msgstr "切断"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "接続しています..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "接続しました"
 
@@ -484,9 +484,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "接続"
 
@@ -520,12 +520,12 @@ msgstr "提案: %s"
 #: ../extensions/deviceicon/network.py:349
 #, python-format
 msgid "Connected for %s"
-msgstr ""
+msgstr "%s に接続しました"
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
-#, python-format, 
 #, python-format
+#, python-format,
 msgid "%d KB"
 msgstr "%d KB"
 
@@ -545,21 +545,21 @@ msgstr "番号の設定を確認してください。"
 msgid "Check your configuration."
 msgstr "設定を確認してください。"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "メッシュネットワーク"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, 
+#: ../extensions/deviceicon/network.py:659
 #, python-format
+#, python-format,
 msgid "Mesh Network %s"
-msgstr "メッシュネットワーク %d"
+msgstr "メッシュネットワーク %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "GSM接続が使えません。"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "コントロールパネルで接続を設定してください。"
 
@@ -919,32 +919,32 @@ msgstr ""
 "-g key このキーの現在の設定値を取得\n"
 "-s key このキーの値を設定 \n"
 "-c 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/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "変更には再起動が必要です"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "変更を取りやめる"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "あとで"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "今すぐ再起動"
 
@@ -983,7 +983,7 @@ msgstr "ジャーナルに保存"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "消去する"
@@ -1080,26 +1080,33 @@ msgstr "お気に入り"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "キーのタイプ:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "認証タイプ:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA と WPA2パーソナル"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "無線のセキュリティ:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "再開"
@@ -1109,12 +1116,12 @@ msgstr "再開"
 msgid "Join"
 msgstr "参加"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "アドホックネットワーク %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "メッシュネットワーク %d"
@@ -1153,7 +1160,6 @@ msgid "%s of %s"
 msgstr "%s の %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, 
 #, python-format
 #, python-format,
 msgid "Transfer from %s"
@@ -1177,10 +1183,9 @@ msgstr "閉じる"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "相手がファイル転送をキャンセルしました"
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, 
 #, python-format
 #, python-format,
 msgid "Transfer to %s"
@@ -1291,81 +1296,81 @@ msgid "Tags:"
 msgstr "タグ:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "ジャーナル"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "検索"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "すべての期間"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "今日"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "昨日から後"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "過去１週間"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "過去１ヶ月"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "過去１年"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "誰でも"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "私の友だち"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "私のクラス"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "すべての種類"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
-msgstr ""
+msgstr "コピー"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "複製"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "コピー中にエラーになりました。%s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1373,24 +1378,24 @@ msgstr "エラー"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "開始"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "更新日で並べ替える"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "作成日で並べ替える"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "サイズで並べ替える"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "並べ替え表示"
 
@@ -1400,11 +1405,11 @@ msgstr "ジャーナルが空です"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
-msgstr ""
+msgstr "書類フォルダは空です"
 
 #: ../src/jarabe/journal/listview.py:321
 msgid "The device is empty"
-msgstr ""
+msgstr "そのデバイスは空です"
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
@@ -1532,7 +1537,7 @@ msgstr "IP設定は正しくありません。"
 
 #: ../src/jarabe/model/network.py:178
 msgid "Secrets were required, but not provided."
-msgstr ""
+msgstr "秘密鍵が必要ですが入力されていません。"
 
 #: ../src/jarabe/model/network.py:180
 msgid ""
diff --git a/po/km.po b/po/km.po
index 06d730f..111d455 100644
--- a/po/km.po
+++ b/po/km.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
-"PO-Revision-Date: 2011-10-08 09:43+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-03-22 15:08+0200\n"
+"Last-Translator: ryansburgoyne <ryansburgoyne@lighteningpoint.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: km\n"
 "MIME-Version: 1.0\n"
@@ -37,25 +37,29 @@ msgstr "អំពី​ខ្ញុំ"
 msgid "You must enter a name."
 msgstr "អ្នក​ត្រូវ​តែ​បញ្ចូល​ឈ្មោះ"
 
+# "hue" translated as "various colors". Any other insights into what is the difference between hue and color in this context?
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
+#, python-format, fuzzy
 msgid "stroke:   color=%s hue=%s"
-msgstr ""
+msgstr "គូស៖  ពណ៌=%s ពណ៌ផ្សេងៗ=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
-msgstr ""
+msgstr "គូស៖  %s"
 
+# See above under stroke hue.
 #: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
+#, python-format, fuzzy
 msgid "fill:     color=%s hue=%s"
-msgstr ""
+msgstr "លាបពេញ៖  ពណ៌=%s ពណ៌ផ្សេងៗ=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
-msgstr ""
+msgstr "លាបពេញ៖  %s"
 
 #: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
@@ -179,7 +183,7 @@ msgstr "ក្រប"
 #: ../extensions/cpsection/keyboard/__init__.py:21
 #: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
-msgstr "ក្តារ​ចុច​"
+msgstr "ក្តារ​ចុច"
 
 #: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
@@ -187,7 +191,7 @@ msgstr "ម៉ូដែល​ក្ដារចុច"
 
 #: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
-msgstr ""
+msgstr "កន្លែងចុចសម្រាប់ប្ដូររបៀបរៀប"
 
 #: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
@@ -217,6 +221,8 @@ 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"
@@ -232,25 +238,27 @@ msgstr "ពាក្យ​សម្ងាត់ ៖"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
-msgstr "លេខ"
+msgstr "លេខ ៖"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
-msgstr ""
+msgstr "នាមនៃកន្លែងចូលទាក់ទង (APN) ៖"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
-msgstr ""
+msgstr "លេខសំគាល់ខ្លួន (PIN) ៖"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
-msgstr ""
+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
@@ -263,12 +271,12 @@ msgstr "ស្ថានភាព​មិន​ស្គាល់"
 
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
-msgstr "​មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះដែលប្រើ បិទ​/បើក"
+msgstr "មាន​បញ្ហានៅ​ក្នុង​វិទ្យុនេះដែលប្រើ បិទ​/បើក"
 
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
-"​មាន​​បញ្ហា​នៅ​​ក្នុង​ការ​កំណត់​​នៃ​ភាព​មិន​ត្រូវ​គ្នា​ដល់​ការ​ប្រើ បិត/បើក"
+"មាន​​បញ្ហា​នៅ​​ក្នុង​ការ​កំណត់​​នៃ​ភាព​មិន​ត្រូវ​គ្នា​ដល់​ការ​ប្រើ បិត/បើក"
 
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
@@ -288,7 +296,7 @@ msgstr "ផ្តាច់​ប្រព័ន្ឋ​ជាមុន​ប្
 
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
-msgstr "ផ្តាច់​ប្រព័ន្ឋ​ជាមុន​ប្រសិន​"
+msgstr "ផ្តាច់​ប្រព័ន្ឋ​ជាមុន​ប្រសិន"
 
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
@@ -375,7 +383,7 @@ msgstr "ប្រព័ន្ធ​របស់​អ្នក​ទាន់ស
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
+msgstr[0] "អ្នកអាចដំឡេីងប្រូក្រាមដែលទាន់សម័យ %s បាន"
 
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
@@ -383,17 +391,17 @@ msgstr "កំពុង​ពិនិត្យ​រក​មើលបច្ច
 
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
-msgstr "ដំឡើង​បច្ចុប្បន្នភាព"
+msgstr "ដំឡើង​បច្ចុប្បន្នភាព..."
 
 #: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
-msgstr[0] ""
+msgstr[0] "ប្រូក្រាមដែលទាន់សម័យ %s បានដំឡេីងហេីយ"
 
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
-msgstr ""
+msgstr "ដំឡេីងប្រូក្រាមដែលបានជ្រេីសរេីស"
 
 #: ../extensions/cpsection/updater/view.py:276
 #, python-format
@@ -403,7 +411,7 @@ msgstr "ទំហំ​ទាញយក ៖ %s"
 #: ../extensions/cpsection/updater/view.py:364
 #, python-format
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
+msgstr "ពីកំណែ %(current)s ទៅជា %(new)s (ទំហំ ៖ %(size)s)"
 
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
@@ -445,9 +453,9 @@ msgstr "ថាមពលនៅសល់តិចតួចណាស់"
 
 #: ../extensions/deviceicon/battery.py:158
 #, python-format
-#, python-format, fuzzy
+#, python-format,
 msgid "%(hour)d:%(min).2d remaining"
-msgstr "%(ម៉ោង)d %(នាទី)២d នៅសល់"
+msgstr "%(hour)d:%(min).2d នៅសល់"
 
 #: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
@@ -460,8 +468,8 @@ msgstr "អាសយដ្ឋាន​ភ្ជាប់​​អ៊ីនធឺ
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "ផ្ដាច់"
 
@@ -471,8 +479,8 @@ msgstr "ផ្ដាច់"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "តភ្ជាប់..."
@@ -480,15 +488,15 @@ msgstr "តភ្ជាប់..."
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "ត​ភ្ជាប់​ហើយ"
 
 #: ../extensions/deviceicon/network.py:130
 msgid "No wireless connection"
-msgstr ""
+msgstr "គ្មានការទាក់ទងឥតខ្សែទេ"
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
@@ -504,15 +512,15 @@ msgstr "ល្បឿន"
 
 #: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
-msgstr ""
+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:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "ភ្ជាប់"
@@ -532,7 +540,7 @@ msgstr "បោះបង់"
 
 #: ../extensions/deviceicon/network.py:333
 msgid "Try connection again"
-msgstr ""
+msgstr "សាកល្បងភ្ជាប់ម្ដងទៀត"
 
 #: ../extensions/deviceicon/network.py:336
 #, python-format
@@ -548,7 +556,7 @@ msgstr "ការ​ផ្តល់​យោ​បល់ ៖ %s"
 #: ../extensions/deviceicon/network.py:349
 #, python-format
 msgid "Connected for %s"
-msgstr ""
+msgstr "តភ្ជាប់ហេីយសម្រាប់ %s"
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
@@ -558,36 +566,36 @@ msgstr "%d គីឡូបៃ"
 
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
-msgstr ""
+msgstr "ពិនិត្យមេីលសណ្ឋាន PIN/PUK របស់អ្នក"
 
 #: ../extensions/deviceicon/network.py:364
 msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
+msgstr "ពិនិត្យមេីលសណ្ឋាននៃនាមកន្លែងចូលភ្ជាប់ (APN) របស់អ្នក"
 
 #: ../extensions/deviceicon/network.py:368
 msgid "Check the Number configuration."
-msgstr ""
+msgstr "ពិនិត្យមេីលសណ្ឋានលេខ"
 
 #: ../extensions/deviceicon/network.py:370
 msgid "Check your configuration."
-msgstr ""
+msgstr "ពិនិត្យមេីលសណ្ឋានរបស់អ្នក"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "បណ្ដាញត"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "បណ្ដាញត %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
-msgstr ""
+msgstr "ការតភ្ជាប់ GSM គ្មានទេ"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
-msgstr ""
+msgstr "បង្កេីតការតភ្ជាប់មួយឡេីងតាមក្ដាឧបករណ៍"
 
 #: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
@@ -603,7 +611,7 @@ msgstr "ស្ងាត់"
 
 #: ../extensions/deviceicon/touchpad.py:38
 msgid "finger"
-msgstr ""
+msgstr "ម្រាមដៃ"
 
 #: ../extensions/deviceicon/touchpad.py:39
 msgid "stylus"
@@ -611,7 +619,7 @@ msgstr "ដែក​ចារ"
 
 #: ../extensions/deviceicon/touchpad.py:68
 msgid "My touchpad"
-msgstr ""
+msgstr "ទ្រនាប់ស្ទាបរបស់ខ្ញុំ"
 
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
@@ -634,12 +642,12 @@ msgstr "សកម្មភាព"
 
 #: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
-msgstr "រូបថត​អេក្រង់​"
+msgstr "រូបថត​អេក្រង់"
 
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
-msgstr ""
+msgstr "រូបថតអេក្រង់អំពី «%s»"
 
 #: ../data/sugar.schemas.in.h:1
 msgid ""
@@ -649,7 +657,7 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
-msgstr ""
+msgstr "ក្របផ្សេងទៀតដែលអាចនឹងមានការបកប្រែទាន់សម័យនៅក្នុងក្របនោះបាន"
 
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
@@ -657,7 +665,7 @@ msgstr "កន្លែង​ចំលង​ទុក"
 
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
-msgstr ""
+msgstr "ទីសំគាល់នៃកញ្ចប់របស់សកម្មភាផដែលបានការពារ"
 
 #: ../data/sugar.schemas.in.h:5
 #, fuzzy
@@ -676,11 +684,11 @@ msgstr "ពន្យារកាច់ជ្រុង"
 
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
-msgstr ""
+msgstr "អក្សរពុម្ពមួយឈុតៗដែលត្រូវរេីសដោយស្វ័យប្រវត្តិ"
 
 #: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
-msgstr ""
+msgstr "ទំហំអក្សរដែលត្រូវរេីសដោយស្វ័យប្រវត្តិ"
 
 #: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
@@ -688,27 +696,27 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr ""
+msgstr "ការពន្យារពេលនឹងធ្វើឲស៊ុំមានសកម្មភាពដោយប្រើកាច់ជ្រុង"
 
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
-msgstr ""
+msgstr "ការពន្យារពេលនឹងធ្វើឲស៊ុំមានសកម្មភាពដោយប្រើគែម"
 
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
-msgstr ""
+msgstr "ស្វែងរកការបកប្រែនៅក្នុងសំណុំឯកសារនេះ"
 
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
-msgstr ""
+msgstr "ការពន្យារពេលគែម"
 
 #: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
-msgstr ""
+msgstr "របៀបរៀបវត្ថុដែលអ្នកចូលចិត្តជាងគេ"
 
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
-msgstr ""
+msgstr "របៀបចាប់ផ្ដើមវត្ថុដែលអ្នកចូលចិត្តជាងគេឡើងវិញ"
 
 #: ../data/sugar.schemas.in.h:16
 #, fuzzy
@@ -940,29 +948,29 @@ msgstr ""
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
-msgstr "ដើម្បី​ទទួល​បាន​សំណើ​សុំ​អោយ​ប្តូរ​ត្រូវ​ចាប់​ផ្តើម​ស៊ូហ្គឺ​ឡើង​វិញ \n"
+msgstr "ដើម្បី​ទទួល​បាន​សំណើ​សុំ​អោយ​ប្តូរ​ត្រូវ​ចាប់​ផ្តើម​ស៊ូហ្គឺ​ឡើង​វិញ\n"
 
 # This is assuming the context is a warning message, like, "Warning: this operation will be permanent."
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "ការ​ប្តូរ​តំរូវ​អោយ​ចាប់​​ផ្តើម​ម៉ាស៊ីន​ឡើង​វិញ"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "បោះបង់ការប្តូរ"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "បន្ទាប់"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "ចាប់​​ផ្តើម​ឡើង​វិញ​ឥឡូវនេះ"
 
@@ -1092,19 +1100,26 @@ msgstr "ពេញនិយមមើល"
 msgid "<Ctrl>1"
 msgstr "<បញ្ជា>១"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "ប្រភេទ​ឆ្នុច ៖"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "ប្រភេទផ្ទៀង ៖"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "ប្រព័ន្ធ​សន្តិសុខ​ឥត​ខ្សែ ៖"
 
@@ -1121,7 +1136,7 @@ msgstr "បន្ត"
 msgid "Join"
 msgstr "ចូល​រួម"
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
@@ -1168,7 +1183,7 @@ msgstr "%s នៃ%s"
 #, python-format
 #, python-format, fuzzy
 msgid "Transfer from %s"
-msgstr "ផ្ទេរ​មកពី%r"
+msgstr "ផ្ទេរ​មកពី%s"
 
 #: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
@@ -1362,12 +1377,12 @@ msgstr "អ្វី​ទាំង​អស់"
 #: ../src/jarabe/journal/palettes.py:93
 #, fuzzy
 msgid "Copy to"
-msgstr "​ចម្លង​ទៅ"
+msgstr "ចម្លង​ទៅ"
 
 #: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
-msgstr "ស្ទួន​"
+msgstr "ស្ទួន"
 
 #: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
diff --git a/po/mg.po b/po/mg.po
index 78d529d..446f394 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2009-05-21 15:10-0400\n"
 "Last-Translator: dina garnier oeliarisoa <dina.garnier.oeliarisoa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,48 +61,48 @@ msgstr "Tsindrio raha hanova ny lokonao:"
 msgid "About my Computer"
 msgstr "Ny momba ny solosaina"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Aoreno:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -110,7 +110,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -433,24 +433,24 @@ msgstr "Adiresy IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -479,9 +479,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -519,6 +519,7 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
+#, python-format
 #, python-format, fuzzy
 msgid "%d KB"
 msgstr "%dKB"
@@ -539,20 +540,20 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -903,26 +904,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Tandremo"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Foano ny fanovàna"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Amin'ny manaraka"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -957,7 +958,7 @@ msgstr ""
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Soloy"
@@ -1049,25 +1050,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
@@ -1077,12 +1085,12 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr ""
@@ -1256,101 +1264,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Firaiketana"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Tadiavo"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Anio, Androany"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Nanomboka omaly"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Tamin'ny herinandro lasa"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Tamin'ny iray volana"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Tamin'ny herin-taona"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Ny olona rehetra"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Ny namako"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Ny kilasiko"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Atomboy"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/mk.po b/po/mk.po
index 120da08..e50b271 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2007-08-08 15:40+0200\n"
 "Last-Translator: Arangel Angov <arangel@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -60,48 +60,48 @@ msgstr "Кликни да смениш боја:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -109,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -433,24 +433,24 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -479,9 +479,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -539,20 +539,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Соседство"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "Соседство"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -903,26 +904,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -957,7 +958,7 @@ msgstr "Зачувај"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1049,25 +1050,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
@@ -1077,12 +1085,13 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "Соседство"
@@ -1255,101 +1264,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/mn.po b/po/mn.po
index 47a46cf..95a7cdf 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-10-12 08:26+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,48 +61,48 @@ msgstr "Товшиж өнгөө солино уу:"
 msgid "About my Computer"
 msgstr "Миний компьютерийн тухай"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Боломжгүй байна"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Онцлох шинж"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Цувралын дугаар:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Програм хангамж"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Хувилбар:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Бичил програм:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Утасгүй бичил хангамж:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Зохиогчийн эрх ба Зөвшөөрөл"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -113,7 +113,7 @@ msgstr ""
 "License-р бүтээгдсэн Sugar бол чөлөөт нээлттэй програм хангамж мөн. Та "
 "үүнийг тодорхой хэдэн заагдсан журмын хүрээнд өөрчилж, түгээж болно."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Бүрэн зөвшөөрөл:"
 
@@ -437,8 +437,8 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Салгах"
 
@@ -448,18 +448,18 @@ msgstr "Салгах"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Холбогдож байна..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Холбогдсон"
 
@@ -488,9 +488,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Холбох"
 
@@ -528,6 +528,7 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
+#, python-format
 #, python-format, fuzzy
 msgid "%d KB"
 msgstr "%d КБайт"
@@ -548,20 +549,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Тархалтын сүлжээ"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, 
+#: ../extensions/deviceicon/network.py:659
+#, python-format
+#, python-format,
 msgid "Mesh Network %s"
 msgstr "Тархалтын сүлжээ %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -924,26 +926,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Өөрчлөлтийг идэвхжүүлэхийн тулд та дахин эхлүүлэх шаардлагатай.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Өөрчлөхийн тулд дахин эхлүүлэх хэрэгтэй"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Өөрчлөлтийг цуцлах"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Дараа"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Одоо эхлүүлэх үү"
 
@@ -982,7 +984,7 @@ msgstr "Хадгалах"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Арилгах"
@@ -1079,26 +1081,33 @@ msgstr "Дуртай зүйлсийг үзэх"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Үндсэн төрөл:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Нэвтрэх нууцлалын төрөл:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr ""
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Эргэж орох"
@@ -1108,12 +1117,12 @@ msgstr "Эргэж орох"
 msgid "Join"
 msgstr "Нэгдэх"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Тархалтын сүлжээ %d"
@@ -1152,7 +1161,6 @@ msgid "%s of %s"
 msgstr "%s-ны %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, 
 #, python-format
 #, python-format,
 msgid "Transfer from %s"
@@ -1179,7 +1187,6 @@ msgid "The other participant canceled the file transfer"
 msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, 
 #, python-format
 #, python-format,
 msgid "Transfer to %s"
@@ -1290,81 +1297,81 @@ msgid "Tags:"
 msgstr "Шошго:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Журнал"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Хайлт"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Ямар ч үед"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Өнөөдөр"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Өчигдрөөс хойших"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Өнгөрсөн долоо хоногт"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Өнгөрсөн сард"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Өнгөрсөн жил"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Хэн ч гэсэн"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Миний найзууд"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Манай анги"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Бүх юм"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Хувилах"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1372,24 +1379,24 @@ msgstr "Алдаа"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Эхлэх"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 936e87e..efc4906 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-10-06 01:46+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,56 +61,59 @@ msgstr "रंग बदलण्यासाठी क्लिक करा"
 msgid "About my Computer"
 msgstr "माझ्या संगणकाबद्दल"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "उपलब्ध नाही"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "ओळख"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "क्रमशः क्रमांक"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "सॉफ्टवेर"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "बिल्ड :"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "शुगर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "फर्मवेर :"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "वायरलेस फर्मवेर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "सर्वाधिकार आणि लाइसेंस"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
 "change it and/or distribute copies of it under certain conditions described "
 "therein."
 msgstr ""
+"तुम्ही पाहत असलेले शुगर हे मुक्त सॉफ्टवेयर आहे, जे GNU (जनरल पब्लीक "
+"लायसेन्स) अंतर्गत आहे, आणि काही ठरावीक नियमात यात बदल करण्यास व याचे कॉपी "
+"पसरवण्यास तुमचे स्वागत करतो."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "पूर्ण लायसेंस:"
 
@@ -182,10 +185,10 @@ msgstr "कीबोर्डची मांडणी"
 msgid "Language"
 msgstr "भाषा"
 
+# jj4zXm  <a href="http://acjkiafvozsb.com/">acjkiafvozsb</a>, [url=http://ocwzcpnvdnkk.com/]ocwzcpnvdnkk[/url], [link=http://qibtzlmestab.com/]qibtzlmestab[/link], http://vzswtyjwbluf.com/
 #: ../extensions/cpsection/language/model.py:30
-#, fuzzy
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "प्रवेश नाही %s.योग्य सेटिंग बनवा."
+msgstr "प्रवेश नाही ~/.i18n. योग्य सेटिंग बनवा."
 
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
@@ -202,40 +205,44 @@ 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 ""
+msgstr "मोडेम कॉन्फिगरेशन"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
-msgstr ""
+msgstr "वापरकर्त्याचे नाव:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
-msgstr ""
+msgstr "पासवर्ड:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
-msgstr ""
+msgstr "अंक:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
-msgstr ""
+msgstr "अॅक्सेस पॉइंटचे नाव:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
-msgstr ""
+msgstr "खाजगी ओळख अंक(पीन):"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
-msgstr ""
+msgstr "खाजगी अनब्लॉक चिन्ह:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:175
 msgid ""
 "You will need to provide the following information to set up a mobile "
 "broadband connection to a cellular (3G) network."
 msgstr ""
+"मोबाइल अथवा सेल्यलर नेटवर्क प्रस्थापित करण्यासाठी तुम्हाला खालाील माहिती "
+"द्यावी लागेल."
 
 #: ../extensions/cpsection/network/__init__.py:21
 #: ../extensions/cpsection/network/view.py:29
@@ -251,9 +258,8 @@ msgid "Error in specified radio argument use on/off."
 msgstr "दिलेल्या रेडिओ सारांशमध्ये चुक आहे, चालू/बंद वापरा"
 
 #: ../extensions/cpsection/network/model.py:140
-#, fuzzy
 msgid "Error in specified argument use 0/1."
-msgstr "दिलेल्या रेडिओ सारांशमध्ये चुक आहे, चालू/बंद वापरा"
+msgstr "दिलेल्या सांराशमध्ये चुक आहे 0/1 वापरा."
 
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
@@ -261,7 +267,7 @@ msgstr "विनतार"
 
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
-msgstr ""
+msgstr "बॅटरीचे आयु्ष्य वाढविण्यासाठी बीनतारी रेडीओ बंद करा."
 
 #: ../extensions/cpsection/network/view.py:82
 #, fuzzy
@@ -271,14 +277,16 @@ 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 ""
+msgstr "नेटवर्कचा मागील तपशील काढुन टाका"
 
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
-msgstr ""
+msgstr "सहयोगाने"
 
 #: ../extensions/cpsection/network/view.py:130
 msgid ""
@@ -286,6 +294,8 @@ msgid ""
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
+"सर्व्हर म्हणजे एक खोली जीथे तुम्ही आहत; एकाच खोलीतील सर्व लोक एकमेकांना पाहु "
+"शकतात,जरी ते एकसारख्या नेटवर्कमध्ये नसले तरी."
 
 #: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
@@ -293,32 +303,32 @@ msgstr "सर्वर :"
 
 #: ../extensions/cpsection/power/__init__.py:21
 msgid "Power"
-msgstr ""
+msgstr "उर्जा"
 
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
-msgstr ""
+msgstr "स्वयंचलित पीएम सारांशा मधे चुक आहे, चालू/बंद वापरा"
 
 #: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
-msgstr ""
+msgstr "शेवटच्या पीएम सारांशामधे चुक आहे, चालू/बंद वापरा."
 
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
-msgstr ""
+msgstr "उर्जा व्यवस्था"
 
 #: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
-msgstr ""
+msgstr "स्वयंचलित उर्जा व्यवस्था (बॅटरीचा जीवन काळ वाढत)"
 
 #: ../extensions/cpsection/power/view.py:86
 msgid ""
 "Extreme power management (disables wireless radio, increases battery life)"
-msgstr ""
+msgstr "जबर उर्जा व्यवस्था ( विनतार रेडियो बंद करतो, बॅटरीचा जीवन काळ वाढत)"
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
-msgstr ""
+msgstr "सॉफ्टवेर अपडेट"
 
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
@@ -329,43 +339,43 @@ msgstr ""
 #: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
-msgstr ""
+msgstr "तपासत आहे %s..."
 
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
-msgstr ""
+msgstr "डाउनलोड चालू आहे %s..."
 
 #: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
-msgstr ""
+msgstr "अपडेटींग %s..."
 
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
-msgstr ""
+msgstr "तुमचे सॉफ्टवेर अद्यावत आहे"
 
 #: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s अपडेट तुम्ही इंस्टॉल करू शकता"
+msgstr[1] "%s अपडेटस तुम्ही इंस्टॉल करू शकता"
 
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
-msgstr ""
+msgstr "अपडेटस तपासत आहे..."
 
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
-msgstr ""
+msgstr "अपडेटस इंस्टॉल करत अहे..."
 
 #: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s अपडेट इंस्टॉल झाले."
+msgstr[1] "%s अपडेटस इंस्टॉल झाले."
 
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
@@ -437,8 +447,8 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "संपर्क तोडा"
 
@@ -448,17 +458,17 @@ msgstr "संपर्क तोडा"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "संपर्क जुळले"
 
@@ -476,7 +486,7 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
-msgstr ""
+msgstr "गती"
 
 #: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
@@ -487,9 +497,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "संपर्क साधा"
 
@@ -513,7 +523,7 @@ msgstr ""
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "चुक: %s"
 
 #: ../extensions/deviceicon/network.py:340
 #, python-format
@@ -547,20 +557,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "मेष जाळे"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "मेष जाळे %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -763,12 +774,14 @@ msgid "Jabber Server"
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:35
+#, fuzzy
 msgid "Keyboard layouts"
-msgstr ""
+msgstr "कीबोर्डची मांडणी"
 
 #: ../data/sugar.schemas.in.h:36
+#, fuzzy
 msgid "Keyboard model"
-msgstr ""
+msgstr "कीबोर्डचे नमुने"
 
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
@@ -893,10 +906,11 @@ msgstr "शुगर-कंट्रोल-पॅनेल:की=%s पर्�
 msgid "sugar-control-panel: %s"
 msgstr "शुगर-कंट्रोल-पॅनेल:%s"
 
+# TRANS: Translators, there's a empty line at the end of this string,
+# which must appear in the translated string (msgstr) as well.
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
 #: ../src/jarabe/controlpanel/cmd.py:38
-#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -917,32 +931,32 @@ msgstr ""
 "                         -h_ ह्या किल्लीबद्दल माहिती दाखवा       -g किल्ली_ "
 " किल्लीची सध्याची किंमत घ्या \n"
 "          -s किल्ली_  किल्लीला  सध्याची किंमत द्या \n"
-"\t"
+"    "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "तुम्ही केलेले बदल लागू करण्यासाठी शुगर परत चालू करा.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "बदली लागू करण्यासाठी परत सुरू करा"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "बदली रद्द करा"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "नंतर"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "परत सुरू करा"
 
@@ -962,12 +976,12 @@ msgstr ""
 
 #: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
-msgstr ""
+msgstr "मीटाव नक्की करा"
 
 #: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
+msgstr "मीटाव नक्की करा: तुम्हाला %s कायमसाठी मिटवायची आहे का"
 
 #: ../src/jarabe/desktop/activitieslist.py:362
 #: ../src/jarabe/frame/clipboardmenu.py:67
@@ -977,10 +991,10 @@ msgstr "संभाला"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
-msgstr ""
+msgstr "खोडा"
 
 #: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
@@ -1015,24 +1029,24 @@ msgstr ""
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
-msgstr ""
+msgstr "त्रिकोण"
 
 #: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
-msgstr ""
+msgstr "नोंदणीकरन असफल"
 
 #: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
-msgstr ""
+msgstr "नोंदणीकरन सफल"
 
 #: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
-msgstr ""
+msgstr "आता तुमच्या स्कूल सर्वर बरोबर तुमची नोंदणी झाली"
 
 #: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
@@ -1045,53 +1059,60 @@ msgstr ""
 
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
-msgstr ""
+msgstr "सॉफ्टवेर अपडेट"
 
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
+"नवीन सॉफ्टवेर बरोबर आपल्या एकटीवीटीची अनुरूपताची खात्री करण्यासाठी ते अपडेट "
+"करून घ्या"
 
 #: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
-msgstr ""
+msgstr "आता पहा"
 
 #: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr "यादी दृष्य"
 
 #: ../src/jarabe/desktop/homebox.py:198
-#, fuzzy
 msgid "<Ctrl>2"
-msgstr "<ctr>L"
+msgstr "<ctr>2"
 
 #: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr "आवडते दृश्‍ा"
 
 #: ../src/jarabe/desktop/homebox.py:254
-#, fuzzy
 msgid "<Ctrl>1"
-msgstr "<ctr>L"
+msgstr "<ctr>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "कळ प्रकार"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "पमाणिकरणचा प्रकार"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "पुन्हा आरंभ करणे"
@@ -1101,23 +1122,24 @@ msgstr "पुन्हा आरंभ करणे"
 msgid "Join"
 msgstr "सामील व्हा"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "मेष जाळे %d"
 
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
-msgstr ""
+msgstr "सर्वरला संपर्क करू शकत नाही."
 
 #: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
-msgstr ""
+msgstr "सर्वर मागणी पूर्ण करू शकत नाही"
 
 #: ../src/jarabe/frame/activitiestray.py:187
 #: ../src/jarabe/frame/activitiestray.py:574
@@ -1234,11 +1256,11 @@ msgstr "पूढे"
 #: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
 #: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
-msgstr ""
+msgstr "विषयरहीत"
 
 #: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
-msgstr ""
+msgstr "आगाऊ प्रदर्शन नाही"
 
 #: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
@@ -1249,137 +1271,141 @@ msgstr ""
 #: ../src/jarabe/journal/listmodel.py:150
 #: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
-msgstr ""
+msgstr "अनोळखी"
 
 #: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
-msgstr ""
+msgstr "तारीख: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
-msgstr ""
+msgstr "माप: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:294
 #: ../src/jarabe/journal/misc.py:108
 msgid "No date"
-msgstr ""
+msgstr "तारीख नाही"
 
 #: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
-msgstr ""
+msgstr "प्रतिस्पर्धी"
 
 #: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
-msgstr ""
+msgstr "वर्णन:"
 
 #: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
-msgstr ""
+msgstr "ठसा:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
-msgstr ""
+msgstr "नियतकालिक"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
-msgstr ""
+msgstr "शोधा"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
-msgstr ""
+msgstr "कोणत्याही वेळी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
-msgstr ""
+msgstr "आज"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
-msgstr ""
+msgstr "कालपासून"
 
+# TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
-msgstr ""
+msgstr "गेल्या आठवडयात"
 
+# TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
-msgstr ""
+msgstr "गेल्या महिन्यात"
 
+# TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
-msgstr ""
+msgstr "गेल्या वर्षी"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
-msgstr ""
+msgstr "कोणीही"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
-msgstr ""
+msgstr "माझे मित्र"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
-msgstr ""
+msgstr "माझा वर्ग"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+# TRANS: Item in a combo box that filters by entry type.
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
-msgstr ""
+msgstr "काहीही"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
-msgstr ""
+msgstr "चुक"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "चालू करा"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
 #: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
-msgstr ""
+msgstr "तुमचे नियतकालिक रिकामी आहे"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
@@ -1409,24 +1435,24 @@ msgstr ""
 
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
-msgstr ""
+msgstr "तुमचे नियतकालिक भरलेली आहे"
 
 #: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
+msgstr "कृपया नवीन फाइल जागा करण्यासाठी नियतकालिक मधील जुन्या भरती मिटवा."
 
 #: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
-msgstr ""
+msgstr "नियतकालिक दाखवा"
 
 #: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
-msgstr ""
+msgstr "वस्तू निवडा"
 
 #: ../src/jarabe/journal/objectchooser.py:151
 #: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
-msgstr ""
+msgstr "बंद करा"
 
 #: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
@@ -1721,7 +1747,7 @@ msgstr ""
 
 #: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
-msgstr ""
+msgstr "स्त्रोत्र"
 
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
diff --git a/po/nb.po b/po/nb.po
index c9cbe82..3848a2d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-07-26 13:31+0200\n"
 "Last-Translator: Kent Dahl <kentda@pvv.org>\n"
 "Language-Team: Norsk bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -61,49 +61,49 @@ msgstr "Klikk for å endre din farge:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Ikke tilgjengelig"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Serienummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Programvare"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Bygg:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 #, fuzzy
 msgid "Firmware:"
 msgstr "Fastvare:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -111,7 +111,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -443,24 +443,24 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Koble fra"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Kobler til..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Tilkoblet"
 
@@ -489,9 +489,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Koble til"
 
@@ -549,22 +549,22 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 #, fuzzy
 msgid "Mesh Network"
 msgstr "Maskenettverk"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 #, fuzzy
 msgid "Mesh Network %s"
 msgstr "Maskenettverk"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -932,26 +932,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "For å gjennomføre endringene må du starte sugar på nytt.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Endringer krever omstart"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Avbryt endringer"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Senere"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Start om nå"
 
@@ -986,7 +986,7 @@ msgstr "Behold"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Slett"
@@ -1081,25 +1081,32 @@ msgstr "Favoritvisning"
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Nøkkelform:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Autentiseringsform:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Gjenoppta"
@@ -1109,12 +1116,12 @@ msgstr "Gjenoppta"
 msgid "Join"
 msgstr "Bli med"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 #, fuzzy
 msgid "Mesh Network %d"
@@ -1288,101 +1295,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Start"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/ne.po b/po/ne.po
index b4a2164..4f32930 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2012-02-06 07:21+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,48 +73,48 @@ msgstr "रङ्ग परिवर्तन गर्न क्लिक ग�
 msgid "About my Computer"
 msgstr "मेरो कम्प्यूटरको बारेमा"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "उपलब्ध छैन"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "व्यक्तित्व"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "क्रमिक अङ्क:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "सफ्टवेर"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "बनाइ:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "शुगर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "फर्मवेर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "तारबिनाको फर्मवेर:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "कपिराइट र अनुमतिपत्र"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -125,7 +125,7 @@ msgstr ""
 "जुन GNU जनरल पब्लिक अनुमति पत्रले हेर्छ, र तोकिएको नियमअनुसार तपाईंले यसलाई "
 "परिवर्तन गरेर नियम अनुसार अरुलाई दिन सक्नुहुनेछ।"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "सम्पूर्ण अनुमति पत्र:"
 
@@ -460,8 +460,8 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "विच्छेद भयो"
 
@@ -471,18 +471,18 @@ msgstr "विच्छेद भयो"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "जडान हुदैछ..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "जडान भयो"
 
@@ -511,9 +511,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "जोड"
 
@@ -571,20 +571,20 @@ msgstr "संख्या विन्यासको जाँच गर।"
 msgid "Check your configuration."
 msgstr "तिम्रो विन्यासको जाँच गर।"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "मेश सञ्जाल"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "मेश सञ्जाल %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "कुनै पनि GSM कनेक्सन उपलब्ध छैन।"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "कन्ट्रोल पानेल मा नयाँ कनेक्सन बनाऊ ।"
 
@@ -960,26 +960,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "परिवर्तन लागू गर्न सुगर पुन:शुरु गर्नु पर्छ ।\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "परिवर्तनका लागि पुण: सुरु गर्न आवश्यक छ"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "परिवर्तनहरु रद्द गर"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "पछि"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "पुन: सुरु गर"
 
@@ -1018,7 +1018,7 @@ msgstr "राख"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "मेट"
@@ -1115,26 +1115,33 @@ msgstr "मन्पर्दो दृश्य"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>१"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "कुञ्जी प्रकार:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "प्रमाणीकरण प्रकार:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA र WPA2 निजी"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "तारबिनाको लागि सुरक्षा"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "पुनरारम्भ"
@@ -1144,12 +1151,12 @@ msgstr "पुनरारम्भ"
 msgid "Join"
 msgstr "सहभागी होऊ"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Ad-hoc सञ्जाल %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "मेश सञ्जाल %d"
@@ -1323,81 +1330,81 @@ msgid "Tags:"
 msgstr "चिनोहरु:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "पंजिका"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "खोज"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "कुनैबेला"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "आज"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "हिजो देखि"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "गत हप्ता"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "गत महिना"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "गत वर्ष"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "जो सुकै"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "मेरा साथीहरु"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "मेरो कक्षा"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "कुनैपनि"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "मा प्रतिलिपी बनाउ"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "नक्कल"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "प्रविष्टि कपि गर्दा त्रुटि। %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1405,24 +1412,24 @@ msgstr "त्रुटि"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "सुरु गर"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "परिमार्जित मिति क्रमबद्व रुपमा राखनुहोस्"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "परिमार्जित मिति सृजित गरेको अनुसार क्रमबद्व रुपमा राखनुहोस्"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "साइज अनुसार क्रमबद्व रुपमा राखनुहोस्"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "क्रमबद्ध दृश्य"
 
diff --git a/po/nl.po b/po/nl.po
index 05a1349..19245ce 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,9 +10,9 @@ 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: 2011-09-28 19:06+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2011-10-28 13:59+0200\n"
+"Last-Translator: whe <heppew@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -65,48 +65,48 @@ msgstr "Klik om de kleur te veranderen:"
 msgid "About my Computer"
 msgstr "Over mijn computer"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Niet beschikbaar"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
-msgstr ""
+msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identiteit"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Serienummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Bouw:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Firmware draadloos netwerk:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Copyright en licentie"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -118,7 +118,7 @@ msgstr ""
 "je mag het aanpassen en/of kopieën distribueren onder de condities zoals "
 "vermeld in de licentie."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Volledige licentie:"
 
@@ -326,7 +326,6 @@ msgid "Automatic power management (increases battery life)"
 msgstr "Automatisch energiebeheer (verhoogt gebruiksduur accu)"
 
 #: ../extensions/cpsection/power/view.py:86
-#, fuzzy
 msgid ""
 "Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
@@ -396,7 +395,8 @@ msgid "Download size: %s"
 msgstr "Downloadgrootte: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr "Van versie %(current)s naar %(new)s (Grootte: %(size)s)"
 
@@ -454,31 +454,31 @@ msgstr "IP adres: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Verbinding verbreken"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Verbinden..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Verbonden"
 
 #: ../extensions/deviceicon/network.py:130
 msgid "No wireless connection"
-msgstr ""
+msgstr "Geen draadloze verbinding"
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
@@ -501,9 +501,9 @@ msgid "Please wait..."
 msgstr "Even geduld aub..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -522,61 +522,63 @@ msgstr "Annuleren"
 
 #: ../extensions/deviceicon/network.py:333
 msgid "Try connection again"
-msgstr ""
+msgstr "Probeer verbinding opnieuw"
 
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Fout: %s"
 
 #: ../extensions/deviceicon/network.py:340
 #, python-format
 msgid "Suggestion: %s"
-msgstr ""
+msgstr "Suggestie: %s"
 
 #: ../extensions/deviceicon/network.py:349
 #, python-format
 msgid "Connected for %s"
-msgstr ""
+msgstr "Verbonden voor %s"
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
-#, python-format, fuzzy
+#, python-format
+#, python-format,
 msgid "%d KB"
-msgstr "%dKB"
+msgstr "%d KB"
 
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
-msgstr ""
+msgstr "Controleer je Pin/Puk configuratie."
 
 #: ../extensions/deviceicon/network.py:364
 msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
+msgstr "Controleer je ToegangsPuntNaam (APN) configuratie"
 
 #: ../extensions/deviceicon/network.py:368
 msgid "Check the Number configuration."
-msgstr ""
+msgstr "Controleer de Getal configuratie."
 
 #: ../extensions/deviceicon/network.py:370
 msgid "Check your configuration."
-msgstr ""
+msgstr "Controleer je configuratie."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Mesh netwerk"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, 
+#: ../extensions/deviceicon/network.py:659
+#, python-format
+#, python-format,
 msgid "Mesh Network %s"
 msgstr "Mesh Netwerk %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
-msgstr ""
+msgstr "Geen GSM verbinding beschikbaar."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
-msgstr ""
+msgstr "Maak een verbinding met het besturingspaneel."
 
 #: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
@@ -592,15 +594,15 @@ msgstr "Dempen"
 
 #: ../extensions/deviceicon/touchpad.py:38
 msgid "finger"
-msgstr ""
+msgstr "vinger"
 
 #: ../extensions/deviceicon/touchpad.py:39
 msgid "stylus"
-msgstr ""
+msgstr "schacht"
 
 #: ../extensions/deviceicon/touchpad.py:68
 msgid "My touchpad"
-msgstr ""
+msgstr "Mijn aanraakscherm"
 
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
@@ -648,18 +650,17 @@ msgstr "Back-up URL"
 
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
-msgstr ""
+msgstr "Bundel IDs van beschermde activiteiten"
 
 #: ../data/sugar.schemas.in.h:5
-#, fuzzy
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
 "composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
-"Kleur van het XO icoon dat op de desktop gebruikt word. De waarden bestaan "
+"Kleur van het XO icoon dat op de desktop gebruikt wordt. De waarden bestaan "
 "uit een lijnkleur en een vulkleur, formaat is gelijk aan rbg kleuren. "
-"Bijvoorbeeld: #AC32FF,#9A5200"
+"Voorbeeld: #AC32FF,#9A5200"
 
 #: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
@@ -770,9 +771,8 @@ msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr "Indien WAAR, zal Sugar een \"Afmelden\" optie geven."
 
 #: ../data/sugar.schemas.in.h:32
-#, fuzzy
 msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr "Indien WAAR, zal Sugar een \"Afmelden\" optie geven."
+msgstr "Indien WAAR, zal Sugar een \"Herstart\" optie geven."
 
 #: ../data/sugar.schemas.in.h:33
 msgid ""
@@ -780,6 +780,9 @@ msgid ""
 "Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
 "hoc network."
 msgstr ""
+"Indien WAAR, zal Sugar standaard de Ad-hoc netwerken voor de kanalen 1,6 en "
+"11 tonen. Als Sugas geen \"bekend\" netwerk ziet bij het opstarten, wordt het "
+"autimatisch verbonden meet een Ad-hoc netwerk."
 
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
@@ -842,11 +845,11 @@ msgstr "Afmelden weergeven"
 
 #: ../data/sugar.schemas.in.h:48
 msgid "Show Restart"
-msgstr ""
+msgstr "Toon Herstart"
 
 #: ../data/sugar.schemas.in.h:49
 msgid "Show Sugar Ad-hoc networks"
-msgstr ""
+msgstr "Toon Sugar Ad-hoc netwerken"
 
 #: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
@@ -884,6 +887,8 @@ msgstr "Gebruikersnaam die op de desktop gebruikt wordt."
 msgid ""
 "Users will not be allowed to erase these activities through the list view."
 msgstr ""
+"Gebruiker wordt niet toegestaan om deze activiteiten te wissen bij het tonen "
+"van de lijst."
 
 #: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
@@ -952,26 +957,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Om je veranderingen toe te passen moet je sugar herstarten.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Waarschuwing"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Verandering vereist een herstart"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Veranderingen annuleren"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Later"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Herstart nu"
 
@@ -1011,7 +1016,7 @@ msgstr "Bewaar"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Wissen"
@@ -1078,7 +1083,7 @@ msgstr "Registreren"
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
 msgid "Register again"
-msgstr ""
+msgstr "Registreer opnieuw"
 
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
@@ -1110,26 +1115,33 @@ msgstr "Favorietenweergave"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Sleutel type:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Authenticatie type:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Persoonlijk"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Draadloze netwerkbeveiliging:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Hervatten"
@@ -1139,12 +1151,12 @@ msgstr "Hervatten"
 msgid "Join"
 msgstr "Bijvoegen"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
-msgstr ""
+msgstr "Ad-hoc Netwerk %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Mesh Netwerk %d"
@@ -1183,7 +1195,8 @@ msgid "%s of %s"
 msgstr "%s van %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer from %s"
 msgstr "Overdragen van %s"
 
@@ -1205,15 +1218,15 @@ msgstr "Wegdoen"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "De andere deelnemer heeft bestand overdracht afgebroken"
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer to %s"
 msgstr "Overdragen naar %s"
 
 #: ../src/jarabe/frame/clipboardmenu.py:56
-#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
 msgstr "Verwijderen"
@@ -1317,108 +1330,108 @@ msgid "Tags:"
 msgstr "Labels:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Dagboek"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Ieder tijdstip"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Sinds gisteren"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Afgelopen week"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Afgelopen maand"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Afgelopen jaar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Iedereen"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Mijn vrienden"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Mijn klas"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Alles"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
-msgstr ""
+msgstr "Kopieer naar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
-msgstr ""
+msgstr "Dubbele"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
-msgstr ""
+msgstr "Fout bij het kopiëren. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Start"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
-msgstr ""
+msgstr "Sorteer op wijzigingsdatum"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
-msgstr ""
+msgstr "Sorteer op aanmaakdatum"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
-msgstr ""
+msgstr "Sorteer op grootte"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
-msgstr ""
+msgstr "Sorteer beeld"
 
 #: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
@@ -1426,11 +1439,11 @@ msgstr "Je dagboek is leeg"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
-msgstr ""
+msgstr "Je documentenfolder is leeg"
 
 #: ../src/jarabe/journal/listview.py:321
 msgid "The device is empty"
-msgstr ""
+msgstr "Het apparaat is leeg"
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
@@ -1443,12 +1456,12 @@ msgstr "Zoekopdracht wissen"
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
 msgid "Older Version Of %s Activity"
-msgstr ""
+msgstr "Oudere Versie Van %s Activiteit"
 
 #: ../src/jarabe/journal/misc.py:274
 #, python-format
 msgid "Do you want to downgrade to version %s"
-msgstr ""
+msgstr "Wil je teruggaan naar versie %s"
 
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
@@ -1493,16 +1506,16 @@ msgstr "Details weergeven"
 
 #: ../src/jarabe/journal/palettes.py:160
 msgid "Entries without a file cannot be sent."
-msgstr ""
+msgstr "Entries zonder bestand kunnen niet verzonden worden."
 
 #: ../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 ""
+msgstr "Entries zonder een bestand kunnen niet gekopieerd worden."
 
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
-msgstr ""
+msgstr "Klembord"
 
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
@@ -1517,9 +1530,8 @@ msgid "No activity to resume entry"
 msgstr "Geen activiteit om invoer mee te hervatten"
 
 #: ../src/jarabe/journal/volumestoolbar.py:209
-#, fuzzy
 msgid "Documents"
-msgstr "Document"
+msgstr "Documenten"
 
 #: ../src/jarabe/journal/volumestoolbar.py:391
 #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
@@ -1529,170 +1541,174 @@ msgstr "%(free_space)d MB vrij"
 
 #: ../src/jarabe/model/network.py:163
 msgid "The reason for the device state change is unknown."
-msgstr ""
+msgstr "De reden voor wijziging van de apparaatstatus is onbekend."
 
 #: ../src/jarabe/model/network.py:165
 msgid "The state change is normal."
-msgstr ""
+msgstr "De statuswijziging is normaal."
 
 #: ../src/jarabe/model/network.py:167
 msgid "The device is now managed."
-msgstr ""
+msgstr "Het apparaat is nu beheerd."
 
 #: ../src/jarabe/model/network.py:169
 msgid "The device is no longer managed."
-msgstr ""
+msgstr "Het apparaat wordt niet meer beheerd."
 
 #: ../src/jarabe/model/network.py:171
 msgid "The device could not be readied for configuration."
-msgstr ""
+msgstr "Het apparaat kon niet worden klaargemaakt voor configuratie."
 
 #: ../src/jarabe/model/network.py:173
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc)."
 msgstr ""
+"IP configuratie kon niet gereserveerd worden (geen beschikbaar adres, "
+"timeout etc)."
 
 #: ../src/jarabe/model/network.py:176
 msgid "The IP configuration is no longer valid."
-msgstr ""
+msgstr "De IP configuratie is niet meer geldig."
 
 #: ../src/jarabe/model/network.py:178
 msgid "Secrets were required, but not provided."
-msgstr ""
+msgstr "Geheimen zijn nodig, maar niet beschikbaar gesteld."
 
 #: ../src/jarabe/model/network.py:180
 msgid ""
 "The 802.1X supplicant disconnected from the access point or authentication "
 "server."
 msgstr ""
+"De 802.1X supplicant verbrak verbinding van het toegangspunt of de "
+"authenticatie server."
 
 #: ../src/jarabe/model/network.py:183
 msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
+msgstr "Configuratie van de 802.1X supplicant ging fout."
 
 #: ../src/jarabe/model/network.py:185
 msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
+msgstr "De 802.1X supplicant stopte of ging fout onverwacht."
 
 #: ../src/jarabe/model/network.py:187
 msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
+msgstr "De 802.1X supplicant duurde te lang voor autenticatie."
 
 #: ../src/jarabe/model/network.py:189
 msgid "The PPP service failed to start within the allowed time."
-msgstr ""
+msgstr "De PPP dienst opstarten ging niet goed binnen de toegestane tijd."
 
 #: ../src/jarabe/model/network.py:191
 msgid "The PPP service disconnected unexpectedly."
-msgstr ""
+msgstr "De PPP dienst is onverwacht afgebroken."
 
 #: ../src/jarabe/model/network.py:193
 msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
+msgstr "De PPP dienst stopte of ging fout onverwacht."
 
 #: ../src/jarabe/model/network.py:195
 msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
+msgstr "De DHCP dienst startte niet binnen de toegestane tijd."
 
 #: ../src/jarabe/model/network.py:197
 msgid "The DHCP service reported an unexpected error."
-msgstr ""
+msgstr "De DHCP dienst gaf een onverwachte fout."
 
 #: ../src/jarabe/model/network.py:199
 msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
+msgstr "De DHCP dienst stopte of ging fout onverwacht."
 
 #: ../src/jarabe/model/network.py:201
 msgid "The shared connection service failed to start."
-msgstr ""
+msgstr "De gedeelde verbinding dienst startte niet."
 
 #: ../src/jarabe/model/network.py:203
 msgid "The shared connection service quit or failed unexpectedly."
-msgstr ""
+msgstr "De gedeelde verbinding dienst stopte of ging fout onverwacht."
 
 #: ../src/jarabe/model/network.py:206
 msgid "The AutoIP service failed to start."
-msgstr ""
+msgstr "De AutoIP dienst startte niet."
 
 #: ../src/jarabe/model/network.py:208
 msgid "The AutoIP service reported an unexpected error."
-msgstr ""
+msgstr "De AutoIP dienst gaf een onverwachte fout."
 
 #: ../src/jarabe/model/network.py:210
 msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
+msgstr "De AutoIP dienst stopte of ging fout onverwacht."
 
 #: ../src/jarabe/model/network.py:212
 msgid "Dialing failed because the line was busy."
-msgstr ""
+msgstr "Nummerkiezen ging fout, omdat de lijn bezet was."
 
 #: ../src/jarabe/model/network.py:214
 msgid "Dialing failed because there was no dial tone."
-msgstr ""
+msgstr "Nummerkiezen ging fout, omdat er geen kiestoon was."
 
 #: ../src/jarabe/model/network.py:216
 msgid "Dialing failed because there was no carrier."
-msgstr ""
+msgstr "Nummerkiezen ging fout, omdat er geen signaaldrager was."
 
 #: ../src/jarabe/model/network.py:218
 msgid "Dialing timed out."
-msgstr ""
+msgstr "Nummerkiezen timeout."
 
 #: ../src/jarabe/model/network.py:220
 msgid "Dialing failed."
-msgstr ""
+msgstr "Nummerkiezen ging fout."
 
 #: ../src/jarabe/model/network.py:222
 msgid "Modem initialization failed."
-msgstr ""
+msgstr "Modem initializatie ging fout."
 
 #: ../src/jarabe/model/network.py:224
 msgid "Failed to select the specified GSM APN"
-msgstr ""
+msgstr "Lukte niet om de aangegeven GSM APN te kiezen"
 
 #: ../src/jarabe/model/network.py:226
 msgid "Not searching for networks."
-msgstr ""
+msgstr "Zoekt niet naar nerwerken."
 
 #: ../src/jarabe/model/network.py:228
 msgid "Network registration was denied."
-msgstr ""
+msgstr "Netwerkregistratie is verworpen."
 
 #: ../src/jarabe/model/network.py:230
 msgid "Network registration timed out."
-msgstr ""
+msgstr "Netwerkregistratie timeout."
 
 #: ../src/jarabe/model/network.py:232
 msgid "Failed to register with the requested GSM network."
-msgstr ""
+msgstr "Kon niet registreren bij gevraagde GSM netwerk."
 
 #: ../src/jarabe/model/network.py:234
 msgid "PIN check failed."
-msgstr ""
+msgstr "Fout bij PIN controle."
 
 #: ../src/jarabe/model/network.py:236
 msgid "Necessary firmware for the device may be missing."
-msgstr ""
+msgstr "Mist mogelijk benodigde firmware voor apparaat."
 
 #: ../src/jarabe/model/network.py:238
 msgid "The device was removed."
-msgstr ""
+msgstr "Het apparaat is verwijderd."
 
 #: ../src/jarabe/model/network.py:240
 msgid "NetworkManager went to sleep."
-msgstr ""
+msgstr "NetwerkManager ging slapen."
 
 #: ../src/jarabe/model/network.py:242
 msgid "The device's active connection was removed or disappeared."
-msgstr ""
+msgstr "De active verbinding van het apparaat is verwijderd of verdween."
 
 #: ../src/jarabe/model/network.py:245
 msgid "A user or client requested the disconnection."
-msgstr ""
+msgstr "Verbinding verbroken op verzoek van gebruiker of klant."
 
 #: ../src/jarabe/model/network.py:247
 msgid "The device's carrier/link changed."
-msgstr ""
+msgstr "Drager of verbinding van apparaat gewijzigd."
 
 #: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
@@ -1754,7 +1770,6 @@ msgid "Show contents"
 msgstr "Inhoud weergeven"
 
 #: ../src/jarabe/view/palettes.py:229
-#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
 msgstr "Verwijderen"
@@ -1773,7 +1788,7 @@ msgstr "Activiteitsbundel Bron"
 
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
-msgstr ""
+msgstr "Sugar Werktuigkit Bron"
 
 #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
@@ -1782,7 +1797,7 @@ msgstr "Bron weergeven: %r"
 
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
-msgstr ""
+msgstr "Sugar in een venster"
 
 #~ msgid "Disconnect..."
 #~ msgstr "Verbinding verbreken..."
diff --git a/po/pap.po b/po/pap.po
index 1c9bda1..e706cdc 100644
--- a/po/pap.po
+++ b/po/pap.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-06-23 12:17-0400\n"
 "Last-Translator: Urso Wieske <uwieske@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,206 +17,210 @@ msgstr ""
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
-msgstr ""
+msgstr "Tokante mi mes"
 
 #: ../extensions/cpsection/aboutme/model.py:48
-#, fuzzy
 msgid "You must enter a name."
-msgstr "Bo mester fill in un nomber."
+msgstr "Bo mester pone un nòmber."
 
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
-msgstr ""
+msgstr "strepi:   koló=%s tono di koló=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
-msgstr ""
+msgstr "strepi:   %s"
 
 #: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
-msgstr ""
+msgstr "yena:    koló=%s tono=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
-msgstr ""
+msgstr "yena:     %s"
 
 #: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
-msgstr ""
+msgstr "Eror den e modifikadónan di koló spesifiká."
 
 #: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
-msgstr ""
+msgstr "Eror den e kolónan spesifiká."
 
 #: ../extensions/cpsection/aboutme/view.py:235
-#, fuzzy
 msgid "Click to change your color:"
-msgstr "Klik pa kambia kolor:"
+msgstr "Klèk pa kambia bo koló:"
 
 #: ../extensions/cpsection/aboutcomputer/__init__.py:21
 msgid "About my Computer"
-msgstr ""
+msgstr "Tokante mi kòmpiuter"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
-msgstr ""
+msgstr "E no ta disponibel"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
-msgstr ""
+msgstr "Identidat"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
-msgstr ""
+msgstr "Nùmber di serie:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
-msgstr ""
+msgstr "Sòftwèr"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
-msgstr ""
+msgstr "Vershon:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
-msgstr ""
+msgstr "Suku:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
-msgstr ""
+msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
-msgstr ""
+msgstr "Firmware sin waya:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
-msgstr ""
+msgstr "Derechi di kopia i Lisensia"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
 "change it and/or distribute copies of it under certain conditions described "
 "therein."
 msgstr ""
+"Suku ta e konekshon grafiko pa usadó ku bo ta mira aworaki. Suku ta un "
+"programa pòrnada, kubrí pa e lisensia públiko di GNU General Public License, "
+"i bo ta pèrmití pa kambié i/o distribuí kopia di dje bou di sierto "
+"kondishonnan deskribí den e lisensia."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
-msgstr ""
+msgstr "Lisensia kompleto:"
 
 #: ../extensions/cpsection/datetime/__init__.py:21
 msgid "Date & Time"
-msgstr ""
+msgstr "Fecha i ora"
 
 #: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
-msgstr ""
+msgstr "Eror e zona di tempu no ta èksistí."
 
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
-msgstr ""
+msgstr "Zona di tempu"
 
 #: ../extensions/cpsection/frame/__init__.py:21
 msgid "Frame"
-msgstr ""
+msgstr "Kuadro"
 
 #: ../extensions/cpsection/frame/model.py:41
 #: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
-msgstr ""
+msgstr "E balor mester ta un nùmber henter."
 
 #: ../extensions/cpsection/frame/view.py:27
 msgid "never"
-msgstr ""
+msgstr "nunka"
 
 #: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
-msgstr ""
+msgstr "instantáneo"
 
 #: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
-msgstr ""
+msgstr "%s sekònde"
 
 #: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
-msgstr ""
+msgstr "Tardansa den e aktivashon"
 
 #: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
-msgstr ""
+msgstr "Skina"
 
 #: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
-msgstr ""
+msgstr "Rant"
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
 #: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
-msgstr ""
+msgstr "Teklado"
 
 #: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
-msgstr ""
+msgstr "Modèl di teklado"
 
 #: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
-msgstr ""
+msgstr "Tekla(nan) pa kambia diseño"
 
 #: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
-msgstr ""
+msgstr "Skema di teklado"
 
 #: ../extensions/cpsection/language/__init__.py:21
 #: ../extensions/cpsection/language/view.py:33
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
+msgstr "No por a drenta ~/.i18n. Krea esenarionan stándart."
 
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
-msgstr ""
+msgstr "No tabata posibel determiná e idioma pa e kódigo =%s."
 
 #: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
-msgstr ""
+msgstr "Despensami, pero mi no ta papia '%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 ""
+"Agregá idioma den e órden ku bo ta preferá. Si no tin tradukshon disponibel "
+"lo usa e próksimo riba lista."
 
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
 msgid "Modem Configuration"
-msgstr ""
+msgstr "Formashon di modem"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
-msgstr ""
+msgstr "Nòmber di uzadó:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
-msgstr ""
+msgstr "kódigo sekreto:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
-msgstr ""
+msgstr "Number:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
@@ -239,43 +243,43 @@ msgstr ""
 #: ../extensions/cpsection/network/__init__.py:21
 #: ../extensions/cpsection/network/view.py:29
 msgid "Network"
-msgstr ""
+msgstr "Reda"
 
 #: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
-msgstr ""
+msgstr "E estado ta deskonosí."
 
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
-msgstr ""
+msgstr "Eròr den e argumento spesifiká; uza sendé/pagá."
 
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
-msgstr ""
+msgstr "Eror den e argumento spesifiká, uza 0/1."
 
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
-msgstr ""
+msgstr "Sin waya"
 
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
-msgstr ""
+msgstr "Paga e radio pa spar e bateria"
 
 #: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
-msgstr ""
+msgstr "Deskartá historia di e reda si bo tin problema pa konektá ku e reda"
 
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
-msgstr ""
+msgstr "Deskartá historia di e reda"
 
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
-msgstr ""
+msgstr "Kolaborashon"
 
 #: ../extensions/cpsection/network/view.py:130
 msgid ""
@@ -283,30 +287,32 @@ msgid ""
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
+"E sirbidó ta komparabel ku e kamber ku bo ta aden; hende riba e mesun server "
+"por wak otro, asta ora nan no ta riba mesun reda."
 
 #: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
-msgstr ""
+msgstr "Sirbidó:"
 
 #: ../extensions/cpsection/power/__init__.py:21
 msgid "Power"
-msgstr ""
+msgstr "Karga"
 
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
-msgstr ""
+msgstr "Eror den e argumento pm outomátiko, usa sende/paga."
 
 #: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
-msgstr ""
+msgstr "Eror den e argumento pm ekstremo, usa sende/paga."
 
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
-msgstr ""
+msgstr "Maneho di karga"
 
 #: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
-msgstr ""
+msgstr "Maneho outomátiko di karga (prolongá bida di bateria)"
 
 #: ../extensions/cpsection/power/view.py:86
 msgid ""
@@ -315,63 +321,65 @@ msgstr ""
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
-msgstr ""
+msgstr "Aktualisashon di programa"
 
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
+"Aktualisashonnan di programa ta korigí eror, eliminá problema di seguridat i "
+"ofresé karakterístika nobo."
 
 #: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
-msgstr ""
+msgstr "Kontrolando %s..."
 
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
-msgstr ""
+msgstr "Bahando %s..."
 
 #: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
-msgstr ""
+msgstr "Aktualisando %s..."
 
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
-msgstr ""
+msgstr "Bo programa ta aktualisá"
 
 #: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bo por instalá aktualisashon %s"
+msgstr[1] "Bo por instalá aktualisashonnan %s"
 
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
-msgstr ""
+msgstr "Kontrolando aktualisashonnan..."
 
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
-msgstr ""
+msgstr "Instalando aktualisashonnan..."
 
 #: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "aktualisashon %s a kaba di instalá"
+msgstr[1] "aktualisashonnan %s a kaba di instalá"
 
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
-msgstr ""
+msgstr "Instalá e loke a selektá"
 
 #: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Tamaño di download: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
 #, python-format
@@ -380,35 +388,33 @@ msgstr ""
 
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
-#, fuzzy
 msgid "None"
-msgstr "Kla"
+msgstr "Ningun"
 
 #. TRANS: download size of very small updates
 #: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
-msgstr ""
+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 ""
+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 ""
+msgstr "%.1f MB"
 
 #: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "Mi Bateria"
 
 #: ../extensions/deviceicon/battery.py:147
-#, fuzzy
 msgid "Removed"
-msgstr "Elimina"
+msgstr "Eliminá"
 
 #: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
@@ -430,28 +436,28 @@ msgstr "Kargá"
 #: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
-msgstr ""
+msgstr "Adrès di IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Diskonekta"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Konektando..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Konektá"
 
@@ -465,24 +471,24 @@ msgstr "Kanal"
 
 #: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
-msgstr ""
+msgstr "Reda ku waya"
 
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
-msgstr ""
+msgstr "Velosidad"
 
 #: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
-msgstr ""
+msgstr "Modem sin waya"
 
 #: ../extensions/deviceicon/network.py:281
 msgid "Please wait..."
-msgstr ""
+msgstr "Un momento por fabor..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Konekta"
 
@@ -521,8 +527,9 @@ msgstr ""
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
 #, python-format
+#, python-format, fuzzy
 msgid "%d KB"
-msgstr ""
+msgstr "%dKB"
 
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
@@ -540,31 +547,30 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
-msgstr ""
+msgstr "Reda di routernan independiente"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
-msgstr ""
+msgstr "Reda di router independiente %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
 #: ../extensions/deviceicon/speaker.py:61
-#, fuzzy
 msgid "My Speakers"
 msgstr "Mi spikernan"
 
 #: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
-msgstr ""
+msgstr "Desaktivá státus di silensio"
 
 #: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
@@ -584,7 +590,7 @@ msgstr ""
 
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
-msgstr ""
+msgstr "Routernan independiente"
 
 #: ../extensions/globalkey/screenshot.py:61
 #: ../src/jarabe/frame/zoomtoolbar.py:41
@@ -608,13 +614,15 @@ msgstr "Kaptura di pantaya"
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
-msgstr ""
+msgstr "Kopia di pantaya di \"%s\""
 
 #: ../data/sugar.schemas.in.h:1
 msgid ""
 "\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
 "long name."
 msgstr ""
+"E no ta posibel pa pùntra e apudo; 'sistema' pa reusá e nòmber largu di e "
+"kwenta di UNIX."
 
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
@@ -622,7 +630,7 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
-msgstr ""
+msgstr "URL pa warda kopia"
 
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
@@ -637,27 +645,27 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
-msgstr ""
+msgstr "Tardansa di huki"
 
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
-msgstr ""
+msgstr "Tipo di lèter skohí pa e sistema"
 
 #: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
-msgstr ""
+msgstr "Tamaño di lèter skohí pa e sistema"
 
 #: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
-msgstr ""
+msgstr "Apodo skohí pa e sistema"
 
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr ""
+msgstr "Tardansa di aktivashon di e kuadro usando e hukinan."
 
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
-msgstr ""
+msgstr "Tardansa di aktivashon di e kuadro uzando e rantnan."
 
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
@@ -665,23 +673,23 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
-msgstr ""
+msgstr "Tardansa di rant"
 
 #: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
-msgstr ""
+msgstr "Skema di faboritonan"
 
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
-msgstr ""
+msgstr "Funshonalidat di habri favoritonan"
 
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
-msgstr ""
+msgstr "Tipo di lèter ku ta usa na e desktop."
 
 #: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
-msgstr ""
+msgstr "Tamaño di lèter ku ta usa na e desktop."
 
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
@@ -731,19 +739,23 @@ msgstr ""
 msgid "GSM network username configuration"
 msgstr ""
 
+# Kisas BERDAT mester bira TRUE, si e ta un òrdu den e programa?
 #: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
+"Si ta BERDAT, Suku lo pone ku e otro usadónan di e sirbidó Jabber por buska "
+"nos."
 
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
+msgstr "Si ta BERDAT, Suku lo mustra e opshon \"Deskonektá usadó\"."
 
 #: ../data/sugar.schemas.in.h:32
+#, fuzzy
 msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
+msgstr "Si ta BERDAT, Suku lo mustra e opshon \"Deskonektá usadó\"."
 
 #: ../data/sugar.schemas.in.h:33
 msgid ""
@@ -754,60 +766,63 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
-msgstr ""
+msgstr "E sirbidó Jabber"
 
 #: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
-msgstr ""
+msgstr "Skema di teklado"
 
 #: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
-msgstr ""
+msgstr "Modèl di teklado"
 
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
-msgstr ""
+msgstr "Opshonnan di teklado"
 
 #: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
-msgstr ""
+msgstr "Skema di e bista di favoritonan."
 
+# Mi ta asumí ku "layout (variant)" ta parti di e lenga di e programa. Si no ta asina e mester bira "... skema(variante)"
 #: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
+"Lista di skemanan di teklado. Kada drentada mester ta den forma "
+"layout(variant)"
 
 #: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
-msgstr ""
+msgstr "Lista ku opshonnan di teklado."
 
 #: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
-msgstr ""
+msgstr "Karga outomátiko"
 
 #: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
-msgstr ""
+msgstr "Karga outomátiko."
 
 #: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
-msgstr ""
+msgstr "Karga ekstremo"
 
 #: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
-msgstr ""
+msgstr "Karga ekstremo."
 
 #: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
-msgstr ""
+msgstr "Publiká na gadget"
 
 #: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
-msgstr ""
+msgstr "Konfigurashon pa silensiá e aparato di zonidu."
 
 #: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
-msgstr ""
+msgstr "Mustra Deskonektá Usadó"
 
 #: ../data/sugar.schemas.in.h:48
 msgid "Show Restart"
@@ -819,35 +834,35 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
-msgstr ""
+msgstr "Zonido silensiá"
 
 #: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
-msgstr ""
+msgstr "Modèl di teklado pa usa"
 
 #: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
-msgstr ""
+msgstr "Konfigurashon di e zona di orario pa e sistema."
 
 #: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
-msgstr ""
+msgstr "Url pa usa pa e sirbidó jabber."
 
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
-msgstr ""
+msgstr "Url kaminda e backup ta wardá."
 
 #: ../data/sugar.schemas.in.h:56
 msgid "User Color"
-msgstr ""
+msgstr "Koló di usadó"
 
 #: ../data/sugar.schemas.in.h:57
 msgid "User Name"
-msgstr ""
+msgstr "Nòmber di usadó"
 
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
-msgstr ""
+msgstr "Nòmber di usadó usá na e desktop."
 
 #: ../data/sugar.schemas.in.h:59
 msgid ""
@@ -856,17 +871,19 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
-msgstr ""
+msgstr "Nivel di volúmen"
 
 #: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
-msgstr ""
+msgstr "Nivel di volúmen pa e aparato di zonidu."
 
 #: ../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 ""
+"Si bo klek riba un símbolo faborito den e funshonalidat di reanudashon esaki "
+"lo pone ku lo reanudá e drentada pa e aktividat ei."
 
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
@@ -887,10 +904,11 @@ msgstr "sugar-control-panel: klave=%s no ta un opshon disponibel"
 msgid "sugar-control-panel: %s"
 msgstr "sugar-control-panel: %s"
 
+# TRANS: Translators, there's a empty line at the end of this string,
+# which must appear in the translated string (msgstr) as well.
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
 #: ../src/jarabe/controlpanel/cmd.py:38
-#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -903,39 +921,41 @@ msgid ""
 "    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
-"Uso: sugar-control-panel [opshon] klave [argumentonan ...] \n"
-"       Control pa e ambiente di sugar.\n"
-"       Opshonnan: \n"
-"       -h             mustra e help mensahe aki i sali       -l "
-"             lista tur opshon disponibel\n"
-"       -h klave     mustra informashon riba e klave aki\n"
-"       -g klave     hanja e bolr koriente di e klave aki\n"
-"       -s klave     sèt e bolor koriente di klave aki\n"
+"Uso: sugar-control-panel [ opshon ] tekla [ argumentonan ... ] \n"
+"    Kontròl pa e ambiente di suku.\n"
+"    Opshonnan: \n"
+"    -h           mustra e mensahe di yudansa aki i sali \n"
+"    -l           lista tur opshon disponibel \n"
+"    -h klave       mustra informashon riba e klave aki \n"
+"    -g klave       haña e balor aktual di e klave aki \n"
+"    -s klave       sèt e balor aktual di e klave aki \n"
+"    -c klave       kita e balor aktual di e klave aki \n"
+"    "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Pa aplika bo kambionan bo tin ku restart sugar di nobo.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Kidou"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Kambionan ta eksigi restart"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Kansela kambionan"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Despues"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Restart aworaki"
 
@@ -951,83 +971,83 @@ msgstr "Ok"
 #: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
-msgstr ""
+msgstr "Vershon %s"
 
 #: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
-msgstr ""
+msgstr "Konfirmá limpiamentu"
 
 #: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
+msgstr "Konfirmá limpiamentu: bo ke lipia %s permanentemente?"
 
 #: ../src/jarabe/desktop/activitieslist.py:362
 #: ../src/jarabe/frame/clipboardmenu.py:67
 #: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
-msgstr ""
+msgstr "Mantené"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
-msgstr ""
+msgstr "Limpia"
 
 #: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
-msgstr ""
+msgstr "Kita faborito"
 
 #: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
-msgstr ""
+msgstr "Krea faborito"
 
 #. TRANS: label for the freeform layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
-msgstr ""
+msgstr "Forma liber"
 
 #. TRANS: label for the ring layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
-msgstr ""
+msgstr "Renchi"
 
 #. TRANS: label for the spiral layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
-msgstr ""
+msgstr "Spiral"
 
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
-msgstr ""
+msgstr "Kaha"
 
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
-msgstr ""
+msgstr "Triángulo"
 
 #: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
-msgstr ""
+msgstr "E registrashon a frakasá"
 
 #: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
-msgstr ""
+msgstr "Registrashon eksitoso"
 
 #: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
-msgstr ""
+msgstr "Bo ta registrá ku e sirbidó di bo skol."
 
 #: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
-msgstr ""
+msgstr "Registrá"
 
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
@@ -1036,54 +1056,58 @@ msgstr ""
 
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
-msgstr ""
+msgstr "Aktualisashon di programa"
 
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
+msgstr "Aktualisá bo aktividatnan pa hasi nan kompatibel ku e programa nobo"
 
 #: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
-msgstr ""
+msgstr "Kontrolá awòr"
 
 #: ../src/jarabe/desktop/homebox.py:197
-#, fuzzy
 msgid "List view"
 msgstr "Bista di lista"
 
 #: ../src/jarabe/desktop/homebox.py:198
-#, fuzzy
 msgid "<Ctrl>2"
-msgstr "<CTRL>L"
+msgstr "<Ctrl>2"
 
 #: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
-msgstr ""
+msgstr "Bista di faboritonan"
 
 #: ../src/jarabe/desktop/homebox.py:254
-#, fuzzy
 msgid "<Ctrl>1"
-msgstr "<CTRL>L"
+msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tip di Tecla"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tipo di Autentikashon"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
-msgstr ""
+msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
-msgstr ""
+msgstr "Seguridat sin waya:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Resumí"
@@ -1093,48 +1117,48 @@ msgstr "Resumí"
 msgid "Join"
 msgstr "Uni"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
-msgstr ""
+msgstr "Reda di router independiente %d"
 
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
-msgstr ""
+msgstr "No por konektá ku e sirbidó."
 
 #: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
-msgstr ""
+msgstr "E sirbidó no por kompletá e petishon."
 
 #: ../src/jarabe/frame/activitiestray.py:187
 #: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
-msgstr ""
+msgstr "Rechasá"
 
 #: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
-msgstr ""
+msgstr "%dB"
 
 #: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
-msgstr ""
+msgstr "%dKB"
 
 #: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
-msgstr ""
+msgstr "%dMB"
 
 #: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
-msgstr ""
+msgstr "%s di %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
@@ -1143,19 +1167,19 @@ msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
-msgstr ""
+msgstr "Aseptá"
 
 #: ../src/jarabe/frame/activitiestray.py:592
 #: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../src/jarabe/frame/activitiestray.py:626
 #: ../src/jarabe/frame/activitiestray.py:639
 #: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
-msgstr ""
+msgstr "Retirá"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
@@ -1184,7 +1208,7 @@ msgstr "Habri ku"
 #: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
-msgstr ""
+msgstr "%s kòrta"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
@@ -1192,19 +1216,19 @@ msgstr "Besindario"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
-msgstr ""
+msgstr "F2"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
-msgstr ""
+msgstr "F3"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
-msgstr ""
+msgstr "F4"
 
 #: ../src/jarabe/intro/window.py:90
 msgid "Name:"
@@ -1215,9 +1239,8 @@ msgid "Click to change color:"
 msgstr "Klik pa kambia kolor:"
 
 #: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
-#, fuzzy
 msgid "Back"
-msgstr "Bek"
+msgstr "Bèk"
 
 #: ../src/jarabe/intro/window.py:204
 msgid "Next"
@@ -1227,152 +1250,157 @@ msgstr "Sigiente"
 #: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
 #: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
-msgstr ""
+msgstr "Sin título"
 
 #: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
-msgstr ""
+msgstr "Sin bista previo"
 
 #: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
-msgstr ""
+msgstr "Sorto: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:264
 #: ../src/jarabe/journal/listmodel.py:150
 #: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
-msgstr ""
+msgstr "Deskonosí"
 
 #: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
-msgstr ""
+msgstr "Fecha: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
-msgstr ""
+msgstr "Tamaño: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:294
 #: ../src/jarabe/journal/misc.py:108
 msgid "No date"
-msgstr ""
+msgstr "Sin fecha"
 
 #: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
-msgstr ""
+msgstr "Partisipantenan:"
 
 #: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
-msgstr ""
+msgstr "Deskripshon:"
 
 #: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
-msgstr ""
+msgstr "Etikèt:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
-msgstr ""
+msgstr "Diario"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
-msgstr ""
+msgstr "Buska"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
-msgstr ""
+msgstr "Kualke momento"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
-msgstr ""
+msgstr "Awe"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
-msgstr ""
+msgstr "For di ayera"
 
+# TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
-msgstr ""
+msgstr "Siman pasá"
 
+# TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
-msgstr ""
+msgstr "Luna pasá"
 
+# TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
-msgstr ""
+msgstr "Aña pasá"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
-msgstr ""
+msgstr "Kualke hende"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
-msgstr ""
+msgstr "Mi amigunan"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
-msgstr ""
+msgstr "Mi klas"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+# TRANS: Item in a combo box that filters by entry type.
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
-msgstr ""
+msgstr "Kualker kos"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
+# TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
-msgstr ""
+msgstr "Kuminsá"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
 #: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
-msgstr ""
+msgstr "Bo diario ta bashí"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
@@ -1384,11 +1412,11 @@ msgstr ""
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
-msgstr ""
+msgstr "No tin drentada ku ta korespondé"
 
 #: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
-msgstr ""
+msgstr "Klara búskeda"
 
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
@@ -1402,44 +1430,44 @@ msgstr ""
 
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
-msgstr ""
+msgstr "Bo diario ta yen"
 
 #: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
+msgstr "Por fabor, eliminá algun drentada bieu pa traha lugá pa drentada nobo."
 
 #: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
-msgstr ""
+msgstr "Mustra diario"
 
 #: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
-msgstr ""
+msgstr "Skohe un obheto"
 
 #: ../src/jarabe/journal/objectchooser.py:151
 #: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
-msgstr ""
+msgstr "Sera"
 
 #: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
-msgstr ""
+msgstr "Reanudá ku"
 
 #: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
-msgstr ""
+msgstr "Inisiá ku"
 
 #: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
 msgid "No activity to start entry"
-msgstr ""
+msgstr "No tin aktividat pa inisiá drentada"
 
 #: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
-msgstr ""
+msgstr "Manda na"
 
 #: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
-msgstr ""
+msgstr "Mira detaye"
 
 #: ../src/jarabe/journal/palettes.py:160
 msgid "Entries without a file cannot be sent."
@@ -1456,15 +1484,15 @@ msgstr ""
 
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
-msgstr ""
+msgstr "No tin ningun amigu presente"
 
 #: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
-msgstr ""
+msgstr "No a topa ningun konekshon bálido"
 
 #: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
-msgstr ""
+msgstr "No tin aktividat pa reanudá drentada"
 
 #: ../src/jarabe/journal/volumestoolbar.py:209
 msgid "Documents"
@@ -1474,7 +1502,7 @@ msgstr ""
 #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
 msgid "%(free_space)d MB Free"
-msgstr ""
+msgstr "%(free_space)d MB disponibel"
 
 #: ../src/jarabe/model/network.py:163
 msgid "The reason for the device state change is unknown."
@@ -1644,18 +1672,16 @@ msgid "The device's carrier/link changed."
 msgstr ""
 
 #: ../src/jarabe/view/buddymenu.py:67
-#, fuzzy
 msgid "Remove friend"
-msgstr "Kita amigu"
+msgstr "Eliminá amigu"
 
 #: ../src/jarabe/view/buddymenu.py:70
-#, fuzzy
 msgid "Make friend"
-msgstr "Hasi amigu"
+msgstr "Sera amistat"
 
 #: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
-msgstr ""
+msgstr "Paga"
 
 #: ../src/jarabe/view/buddymenu.py:95
 msgid "Restart"
@@ -1663,11 +1689,11 @@ msgstr ""
 
 #: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
-msgstr ""
+msgstr "Mèldu ku ta bai"
 
 #: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
-msgstr ""
+msgstr "Mi konfigurashon"
 
 #: ../src/jarabe/view/buddymenu.py:142
 #, python-format
@@ -1681,7 +1707,7 @@ msgstr ""
 
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
-msgstr ""
+msgstr "Kuminsando..."
 
 #: ../src/jarabe/view/palettes.py:58
 msgid "Activity failed to start"
@@ -1690,19 +1716,19 @@ msgstr ""
 #. TODO: share-with, keep
 #: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
-msgstr ""
+msgstr "Mira fuente"
 
 #: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
-msgstr ""
+msgstr "Stòp"
 
 #: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
-msgstr ""
+msgstr "Kuminsá ku unu nobo"
 
 #: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
-msgstr ""
+msgstr "Mustra kontenido"
 
 #: ../src/jarabe/view/palettes.py:229
 #, fuzzy
@@ -1712,15 +1738,15 @@ msgstr "Elimina"
 
 #: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
-msgstr ""
+msgstr "Fuente Instantáneo"
 
 #: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
-msgstr ""
+msgstr "Fuente"
 
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
-msgstr ""
+msgstr "Fuente di pakete di aktividat"
 
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
@@ -1729,7 +1755,7 @@ msgstr ""
 #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
-msgstr ""
+msgstr "Mira fuente: %r"
 
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
diff --git a/po/pis.po b/po/pis.po
deleted file mode 100644
index 7fd0d5d..0000000
--- a/po/pis.po
+++ /dev/null
@@ -1,1713 +0,0 @@
-# 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.1.1rc4\n"
-
-#: ../extensions/cpsection/aboutme/__init__.py:24
-msgid "About Me"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:48
-msgid "You must enter a name."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:75
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:78
-#, python-format
-msgid "stroke:   %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:80
-#, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:82
-#, python-format
-msgid "fill:     %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:94
-msgid "Error in specified color modifiers."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:97
-msgid "Error in specified colors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:235
-msgid "Click to change your color:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/__init__.py:21
-msgid "About my Computer"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:42
-msgid "Not available"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:171
-#, python-format
-msgid "%(interface)s: %(version)s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:61
-msgid "Identity"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:70
-msgid "Serial Number:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:92
-msgid "Software"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:101
-msgid "Build:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:116
-msgid "Sugar:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:132
-msgid "Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:147
-msgid "Wireless Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:170
-msgid "Copyright and License"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:188
-msgid ""
-"Sugar is the graphical user interface that you are looking at. Sugar is free "
-"software, covered by the GNU General Public License, and you are welcome to "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:200
-msgid "Full license:"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/model.py:92
-msgid "Error timezone does not exist."
-msgstr ""
-
-#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
-msgid "Timezone"
-msgstr ""
-
-#: ../extensions/cpsection/frame/__init__.py:21
-msgid "Frame"
-msgstr ""
-
-#: ../extensions/cpsection/frame/model.py:41
-#: ../extensions/cpsection/frame/model.py:66
-msgid "Value must be an integer."
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:27
-msgid "never"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:28
-msgid "instantaneous"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:29
-#, python-format
-msgid "%s seconds"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:54
-msgid "Activation Delay"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:78
-msgid "Corner"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:113
-msgid "Edge"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:32
-msgid "Keyboard"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:190
-msgid "Keyboard Model"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:250
-msgid "Key(s) to change layout"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:319
-msgid "Keyboard Layout(s)"
-msgstr ""
-
-#: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:33
-msgid "Language"
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:30
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:129
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:152
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr ""
-
-#: ../extensions/cpsection/language/view.py:57
-msgid ""
-"Add languages in the order you prefer. If a translation is not available, "
-"the next in the list will be used."
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/__init__.py:21
-msgid "Modem Configuration"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:94
-msgid "Username:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:106
-msgid "Password:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:118
-msgid "Number:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:130
-msgid "Access Point Name (APN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:142
-msgid "Personal Identity Number (PIN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:154
-msgid "Personal Unblocking Key (PUK):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:175
-msgid ""
-"You will need to provide the following information to set up a mobile "
-"broadband connection to a cellular (3G) network."
-msgstr ""
-
-#: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:29
-msgid "Network"
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:71
-msgid "State is unknown."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:99
-msgid "Error in specified radio argument use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:140
-msgid "Error in specified argument use 0/1."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:61
-msgid "Wireless"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:69
-msgid "Turn off the wireless radio to save battery life"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:82
-msgid "Radio"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:98
-msgid "Discard network history if you have trouble connecting to the network"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:107
-msgid "Discard network history"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:122
-msgid "Collaboration"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:130
-msgid ""
-"The server is the equivalent of what room you are in; people on the same "
-"server will be able to see each other, even when they aren't on the same "
-"network."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:140
-msgid "Server:"
-msgstr ""
-
-#: ../extensions/cpsection/power/__init__.py:21
-msgid "Power"
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:90
-msgid "Error in automatic pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:120
-msgid "Error in extreme pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:48
-msgid "Power management"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:58
-msgid "Automatic power management (increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:86
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/updater/__init__.py:21
-msgid "Software update"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:63
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities, and "
-"provide new features."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:125
-#, python-format
-msgid "Checking %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:127
-#, python-format
-msgid "Downloading %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:129
-#, python-format
-msgid "Updating %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:139
-msgid "Your software is up-to-date"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:141
-#, python-format
-msgid "You can install %s update"
-msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:159
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:164
-msgid "Installing updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:173
-#, python-format
-msgid "%s update was installed"
-msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:255
-msgid "Install selected"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:276
-#, python-format
-msgid "Download size: %s"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:364
-#, python-format
-msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
-
-#. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:382
-msgid "None"
-msgstr ""
-
-#. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:385
-msgid "1 KB"
-msgstr ""
-
-#. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:388
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:391
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:71
-msgid "My Battery"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:147
-msgid "Removed"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:150
-msgid "Charging"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:153
-msgid "Very little power remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:158
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:161
-msgid "Charged"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:49
-#, python-format
-msgid "IP address: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:104
-#: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
-msgid "Disconnect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:112
-#: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
-msgid "Connecting..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:117
-#: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
-msgid "Connected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:130
-msgid "No wireless connection"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:144
-msgid "Channel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:159
-msgid "Wired Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:188
-msgid "Speed"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:213
-msgid "Wireless modem"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:281
-msgid "Please wait..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
-msgid "Connect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:287
-msgid "Disconnected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:294
-#: ../src/jarabe/controlpanel/toolbar.py:119
-#: ../src/jarabe/desktop/homebox.py:71
-#: ../src/jarabe/frame/activitiestray.py:602
-#: ../src/jarabe/frame/activitiestray.py:704
-#: ../src/jarabe/frame/activitiestray.py:732
-msgid "Cancel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:333
-msgid "Try connection again"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:336
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:340
-#, python-format
-msgid "Suggestion: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:349
-#, python-format
-msgid "Connected for %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:355
-#: ../extensions/deviceicon/network.py:356
-#, python-format
-msgid "%d KB"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:361
-msgid "Check your Pin/Puk configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:364
-msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:368
-msgid "Check the Number configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:370
-msgid "Check your configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:612
-msgid "Mesh Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:656
-#, python-format
-msgid "Mesh Network %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:779
-msgid "No GSM connection available."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:780
-msgid "Create a connection in the control panel."
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:61
-msgid "My Speakers"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:138
-msgid "Unmute"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:141
-msgid "Mute"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:38
-msgid "finger"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:39
-msgid "stylus"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:68
-msgid "My touchpad"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:59
-msgid "Mesh"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "Group"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "Home"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "Activity"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:72
-msgid "Screenshot"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:74
-#, python-format
-msgid "Screenshot of \"%s\""
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:1
-msgid ""
-"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
-"long name."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:2
-msgid "Additional directories which can contain updated translations."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:3
-msgid "Backup URL"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:4
-msgid "Bundle IDs of protected activities"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:5
-msgid ""
-"Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rgb colors. "
-"Example: #AC32FF,#9A5200"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:6
-msgid "Corner Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:7
-msgid "Default font face"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:8
-msgid "Default font size"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:9
-msgid "Default nick"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:10
-msgid "Delay for the activation of the frame using the corners."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:11
-msgid "Delay for the activation of the frame using the edges."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:12
-msgid "Directory to search for translations"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:13
-msgid "Edge Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:14
-msgid "Favorites Layout"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:15
-msgid "Favorites resume mode"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:16
-msgid "Font face that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:17
-msgid "Font size that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:18
-msgid "GSM network APN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:19
-msgid "GSM network PIN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:20
-msgid "GSM network PUK"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:21
-msgid "GSM network access point name configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:22
-msgid "GSM network number"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:23
-msgid "GSM network password"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:24
-msgid "GSM network password configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:25
-msgid "GSM network personal identification number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:26
-msgid "GSM network personal unlock key configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:27
-msgid "GSM network telephone number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:28
-msgid "GSM network username"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:29
-msgid "GSM network username configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:30
-msgid ""
-"If TRUE, Sugar will make us searchable for the other users of the Jabber "
-"server."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:31
-msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:32
-msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:33
-msgid ""
-"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
-"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
-"hoc network."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:34
-msgid "Jabber Server"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:35
-msgid "Keyboard layouts"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:36
-msgid "Keyboard model"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:37
-msgid "Keyboard options"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:38
-msgid "Layout of the favorites view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:39
-msgid ""
-"List of keyboard layouts. Each entry should be in the form layout(variant)"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:40
-msgid "List of keyboard options."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:41
-msgid "Power Automatic"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:42
-msgid "Power Automatic."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:43
-msgid "Power Extreme"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:44
-msgid "Power Extreme."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:45
-msgid "Publish to Gadget"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:46
-msgid "Setting for muting the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:47
-msgid "Show Log out"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:48
-msgid "Show Restart"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:49
-msgid "Show Sugar Ad-hoc networks"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:50
-msgid "Sound Muted"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:51
-msgid "The keyboard model to be used"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:53
-msgid "Timezone setting for the system."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:54
-msgid "Url of the jabber server to use."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:55
-msgid "Url where the backup is saved to."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:56
-msgid "User Color"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:57
-msgid "User Name"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:58
-msgid "User name that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:59
-msgid ""
-"Users will not be allowed to erase these activities through the list view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:60
-msgid "Volume Level"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:61
-msgid "Volume level for the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:62
-msgid ""
-"When in resume mode, clicking on a favorite icon will cause the last entry "
-"for that activity to be resumed."
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:28
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:30
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:31
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr ""
-
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:38
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:52
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
-#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
-#: ../src/jarabe/journal/volumestoolbar.py:307
-msgid "Warning"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:297
-#: ../src/jarabe/controlpanel/sectionview.py:41
-msgid "Changes require restart"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:300
-msgid "Cancel changes"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
-msgid "Later"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:309
-msgid "Restart now"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
-msgid "Done"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:125
-#: ../src/jarabe/desktop/favoritesview.py:347
-msgid "Ok"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format
-msgid "Version %s"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:356
-msgid "Confirm erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:358
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:362
-#: ../src/jarabe/frame/clipboardmenu.py:67
-#: ../src/jarabe/view/viewsource.py:280
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:365
-#: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
-#: ../src/jarabe/journal/palettes.py:126
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:435
-msgid "Remove favorite"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:439
-msgid "Make favorite"
-msgstr ""
-
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:127
-msgid "Freeform"
-msgstr ""
-
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:215
-msgid "Ring"
-msgstr ""
-
-#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:402
-msgid "Spiral"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:472
-msgid "Box"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:515
-msgid "Triangle"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:338
-msgid "Registration Failed"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:339
-#, python-format
-msgid "%s"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:341
-msgid "Registration Successful"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:342
-msgid "You are now registered with your school server."
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:641
-msgid "Register"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:643
-#: ../src/jarabe/desktop/favoritesview.py:660
-msgid "Register again"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:66
-msgid "Software Update"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-msgid "Check now"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:197
-msgid "List view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:198
-msgid "<Ctrl>2"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:253
-msgid "Favorites view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:254
-msgid "<Ctrl>1"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:143
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:163
-msgid "Authentication Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:229
-msgid "WPA & WPA2 Personal"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:238
-msgid "Wireless Security:"
-msgstr ""
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
-#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
-msgid "Resume"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:96
-#: ../src/jarabe/frame/activitiestray.py:182
-msgid "Join"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:500
-#, python-format
-msgid "Ad-hoc Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format
-msgid "Mesh Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:143
-msgid "Cannot connect to the server."
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:150
-msgid "The server could not complete the request."
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:187
-#: ../src/jarabe/frame/activitiestray.py:574
-msgid "Decline"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:523
-#, python-format
-msgid "%dB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:525
-#, python-format
-msgid "%dKB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:527
-#, python-format
-msgid "%dMB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:544
-#, python-format
-msgid "%s of %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:558
-#, python-format
-msgid "Transfer from %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:569
-msgid "Accept"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:592
-#: ../src/jarabe/frame/activitiestray.py:722
-#, python-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:626
-#: ../src/jarabe/frame/activitiestray.py:639
-#: ../src/jarabe/frame/activitiestray.py:757
-msgid "Dismiss"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:643
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:691
-#, python-format
-msgid "Transfer to %s"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:56
-msgctxt "Clipboard"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/frame/clipboardmenu.py:85
-msgid "Open"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:90
-msgid "Open with"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardobject.py:50
-#, python-format
-msgid "%s clipping"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "Neighborhood"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "F1"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "F2"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "F3"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "F4"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:90
-msgid "Name:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:126
-msgid "Click to change color:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
-msgid "Back"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:204
-msgid "Next"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:156
-#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
-#: ../src/jarabe/journal/volumestoolbar.py:130
-msgid "Untitled"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:245
-msgid "No preview"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#, python-format
-msgid "Kind: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#: ../src/jarabe/journal/listmodel.py:150
-#: ../src/jarabe/journal/listmodel.py:158
-msgid "Unknown"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:265
-#, python-format
-msgid "Date: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:266
-#, python-format
-msgid "Size: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:294
-#: ../src/jarabe/journal/misc.py:108
-msgid "No date"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:301
-msgid "Participants:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:323
-msgid "Description:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:348
-msgid "Tags:"
-msgstr ""
-
-#: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
-#: ../src/jarabe/journal/palettes.py:198
-#: ../src/jarabe/journal/volumestoolbar.py:368
-msgid "Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:71
-msgid "Search"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:138
-msgid "Anytime"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:140
-msgid "Today"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:142
-msgid "Since yesterday"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
-msgid "Past week"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
-msgid "Past month"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
-msgid "Past year"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:155
-msgid "Anyone"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:157
-msgid "My friends"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:158
-msgid "My class"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:300
-msgid "Anything"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:381
-#: ../src/jarabe/journal/palettes.py:93
-msgid "Copy to"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:389
-#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:422
-#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
-#: ../src/jarabe/journal/volumestoolbar.py:315
-#, python-format
-msgid "Error while copying the entry. %s"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:423
-#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
-#: ../src/jarabe/journal/volumestoolbar.py:316
-msgid "Error"
-msgstr ""
-
-#. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
-#: ../src/jarabe/journal/palettes.py:74
-msgid "Start"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:525
-msgid "Sort by date modified"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:526
-msgid "Sort by date created"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:527
-msgid "Sort by size"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:536
-msgid "Sort view"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:316
-msgid "Your Journal is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:319
-msgid "Your documents folder is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:321
-msgid "The device is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:323
-msgid "No matching entries"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:397
-msgid "Clear search"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:273
-#, python-format
-msgid "Older Version Of %s Activity"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:274
-#, python-format
-msgid "Do you want to downgrade to version %s"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:64
-msgid "Your Journal is full"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:68
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:80
-msgid "Show Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:146
-msgid "Choose an object"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:410
-msgid "Close"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:72
-msgid "Resume with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:75
-msgid "Start with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
-msgid "No activity to start entry"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:112
-msgid "Send to"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:121
-msgid "View Details"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:160
-msgid "Entries without a file cannot be sent."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
-#: ../src/jarabe/journal/volumestoolbar.py:306
-msgid "Entries without a file cannot be copied."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:267
-msgid "Clipboard"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:322
-msgid "No friends present"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:327
-msgid "No valid connection found"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:355
-msgid "No activity to resume entry"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:209
-msgid "Documents"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:391
-#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:163
-msgid "The reason for the device state change is unknown."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:165
-msgid "The state change is normal."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:167
-msgid "The device is now managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:169
-msgid "The device is no longer managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:171
-msgid "The device could not be readied for configuration."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:173
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:176
-msgid "The IP configuration is no longer valid."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:178
-msgid "Secrets were required, but not provided."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:180
-msgid ""
-"The 802.1X supplicant disconnected from the access point or authentication "
-"server."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:183
-msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:185
-msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:187
-msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:189
-msgid "The PPP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:191
-msgid "The PPP service disconnected unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:193
-msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:195
-msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:197
-msgid "The DHCP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:199
-msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:201
-msgid "The shared connection service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:203
-msgid "The shared connection service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:206
-msgid "The AutoIP service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:208
-msgid "The AutoIP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:210
-msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:212
-msgid "Dialing failed because the line was busy."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:214
-msgid "Dialing failed because there was no dial tone."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:216
-msgid "Dialing failed because there was no carrier."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:218
-msgid "Dialing timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:220
-msgid "Dialing failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:222
-msgid "Modem initialization failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:224
-msgid "Failed to select the specified GSM APN"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:226
-msgid "Not searching for networks."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:228
-msgid "Network registration was denied."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:230
-msgid "Network registration timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:232
-msgid "Failed to register with the requested GSM network."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:234
-msgid "PIN check failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:236
-msgid "Necessary firmware for the device may be missing."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:238
-msgid "The device was removed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:240
-msgid "NetworkManager went to sleep."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:242
-msgid "The device's active connection was removed or disappeared."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:245
-msgid "A user or client requested the disconnection."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:247
-msgid "The device's carrier/link changed."
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:67
-msgid "Remove friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:70
-msgid "Make friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:87
-msgid "Shutdown"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:95
-msgid "Restart"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:101
-msgid "Logout"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:106
-msgid "My Settings"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:142
-#, python-format
-msgid "Invite to %s"
-msgstr ""
-
-#: ../src/jarabe/view/launcher.py:145
-#, python-format
-msgid "<b>%s</b> failed to start."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:48
-msgid "Starting..."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:58
-msgid "Activity failed to start"
-msgstr ""
-
-#. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:91
-msgid "View Source"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:102
-msgid "Stop"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:139
-msgid "Start new"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:180
-msgid "Show contents"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:229
-msgctxt "Volume"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:263
-msgid "Instance Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:312
-msgid "Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:374
-msgid "Activity Bundle Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:393
-msgid "Sugar Toolkit Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
-#, python-format
-msgid "View source: %r"
-msgstr ""
-
-#: ../src/jarabe/util/emulator.py:40
-msgid "Sugar in a window"
-msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 21ef5f5..1cc07c6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,9 +4,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: 2011-09-29 15:59+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-03-15 22:07+0200\n"
+"Last-Translator: Marcin <ulinski.marcin@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr "O mnie"
 
 #: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
-msgstr "Musisz podać imię"
+msgstr "Musisz podać imię."
 
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
@@ -60,60 +60,60 @@ msgstr "Kliknij aby zmienić swój kolor:"
 msgid "About my Computer"
 msgstr "O moim komputerze"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Nie dostępny"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Tożsamość"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Numer seryjny:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Oprogramowanie"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Wersja:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
-msgstr "Dropsy (Sugar):"
+msgstr "Bajtek.edu.pl:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Wireless Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Prawa autorskie i licencja"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
 "change it and/or distribute copies of it under certain conditions described "
 "therein."
 msgstr ""
-"Drops jest graficznym interfejsem użytkownika, na który patrzysz. Drops jest "
-"wolnym oprogramowaniem, podlegającym zapisom licencji GNU General Public "
-"License. Mile widzialne jest zmiana i/lub dystrybuowanie jego kopii w ramach "
-"warunków opisanych w owej licencji."
+"Bajtek.edu.pl jest graficznym interfejsem użytkownika, na który patrzysz. "
+"Bajtek.edu.pl jest wolnym oprogramowaniem, podlegającym zapisom licencji GNU "
+"General Public License. Mile widzialne jest zmiana i/lub dystrybuowanie "
+"jego kopii w ramach warunków opisanych w owej licencji."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Pełna licencja:"
 
@@ -136,7 +136,7 @@ msgstr "Ramka"
 #: ../extensions/cpsection/frame/model.py:41
 #: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
-msgstr "Wartość musi być liczbą"
+msgstr "Wartość musi być liczbą."
 
 #: ../extensions/cpsection/frame/view.py:27
 msgid "never"
@@ -147,7 +147,8 @@ msgid "instantaneous"
 msgstr "natychmiastowy"
 
 #: ../extensions/cpsection/frame/view.py:29
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "%s seconds"
 msgstr "%s sekund"
 
@@ -254,7 +255,7 @@ msgstr "Stan nieznany."
 
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
-msgstr "Błąd w podanym argumencie radia użyj Włącz/Wyłącz"
+msgstr "Błąd w podanym argumencie radia użyj Włącz/Wyłącz."
 
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
@@ -266,7 +267,7 @@ msgstr "Bezprzewodowy"
 
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
-msgstr "Wyłącz łączność bezprzewodową (radio) aby oszczędzać baterie."
+msgstr "Wyłącz łączność bezprzewodową (radio) aby oszczędzać baterie"
 
 #: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
@@ -276,7 +277,7 @@ msgstr "Radio"
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 "Usuń historię połączeń sieciowych jeżeli masz problemy z połączeniem się z "
-"siecią."
+"siecią"
 
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
@@ -358,15 +359,15 @@ msgstr "Uaktualniam %s..."
 
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
-msgstr "Używasz najnowszej wersji oprogramowania."
+msgstr "Używasz najnowszej wersji oprogramowania"
 
 #: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Możesz zainstalować %s uaktualnienie."
-msgstr[1] "Możesz zainstalować %s uaktualnienia."
-msgstr[2] "Możesz zainstalować %s uaktualnień."
+msgstr[0] "Możesz zainstalować %s uaktualnienie"
+msgstr[1] "Możesz zainstalować %s uaktualnienia"
+msgstr[2] "Możesz zainstalować %s uaktualnień"
 
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
@@ -380,9 +381,9 @@ msgstr "Instaluję uaktualnienia..."
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
-msgstr[0] "Zostało zainstalowane %s uaktualnienie."
-msgstr[1] "Zostały zainstalowane %s uaktualnienia."
-msgstr[2] "Zostało zainstalowane %s uaktualnień."
+msgstr[0] "Zostało zainstalowane %s uaktualnienie"
+msgstr[1] "Zostały zainstalowane %s uaktualnienia"
+msgstr[2] "Zostało zainstalowane %s uaktualnień"
 
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
@@ -452,24 +453,24 @@ msgstr "Adres IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Rozłącz"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Łączę..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Połączony"
 
@@ -498,9 +499,9 @@ msgid "Please wait..."
 msgstr "Proszę czekać..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Połącz"
 
@@ -548,7 +549,7 @@ msgstr "Sprawdź konfigurację numerów PIN i PUK."
 
 #: ../extensions/deviceicon/network.py:364
 msgid "Check your Access Point Name (APN) configuration"
-msgstr "Sprawdź konfigurację nazwy punktu dostępu (APN)."
+msgstr "Sprawdź konfigurację nazwy punktu dostępu (APN)"
 
 #: ../extensions/deviceicon/network.py:368
 msgid "Check the Number configuration."
@@ -558,20 +559,21 @@ msgstr "Sprawdź jaki podałeś w konfiguracji numer (telefonu)."
 msgid "Check your configuration."
 msgstr "Sprawdź konfigurację (sieci)."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Sieć kratowa (mesh)"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, 
+#: ../extensions/deviceicon/network.py:659
+#, python-format
+#, python-format,
 msgid "Mesh Network %s"
-msgstr "Sieć kratowa (mesh)  %s"
+msgstr "Sieć kratowa (mesh) %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Brak dostępnego połączenia GSM."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Stwórz połączenie w panelu sterowania."
 
@@ -758,16 +760,16 @@ msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
-"Jeżeli TAK, Drops sprawi, że będziemy do odnalezienia przez innych "
+"Jeżeli TAK, Bajtek.edu.pl sprawi, że będziemy do odnalezienia przez innych "
 "użytkowników serwera Jabber."
 
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr "Jeżeli TAK, Drops pokaże opcję \"Wyloguj się\"."
+msgstr "Jeżeli TAK, Bajtek.edu.pl pokaże opcję \"Wyloguj się\"."
 
 #: ../data/sugar.schemas.in.h:32
 msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr "Jeżeli TAK, Drops pokaże opcję \"Restartuj\"."
+msgstr "Jeżeli TAK, Bajtek.edu.pl pokaże opcję \"Restartuj\"."
 
 #: ../data/sugar.schemas.in.h:33
 msgid ""
@@ -775,9 +777,9 @@ msgid ""
 "Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
 "hoc network."
 msgstr ""
-"Jeżeli TAK, Drops pokaże domyślne sieci ad-hoc dla kanałów 1,6 i 11. Jeżeli "
-"Drops nie będzie widział \"znanej\" sieci podczas startu systemu wtedy "
-"automatycznie połączy się z siecią ad-hoc."
+"Jeżeli TAK, Bajtek.edu.pl pokaże domyślne sieci ad-hoc dla kanałów 1,6 i 11. "
+"Jeżeli Bajtek.edu.pl nie będzie widział \"znanej\" sieci podczas startu "
+"systemu wtedy automatycznie połączy się z siecią ad-hoc."
 
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
@@ -803,7 +805,7 @@ msgstr "Układ widoku ulubionych."
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
-"Lista układów klawiatur. Każdy wpis powinien być w postaci układ(zmienna)."
+"Lista układów klawiatur. Każdy wpis powinien być w postaci układ(zmienna)"
 
 #: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
@@ -843,7 +845,7 @@ msgstr "Pokaż \"Restartuj\""
 
 #: ../data/sugar.schemas.in.h:49
 msgid "Show Sugar Ad-hoc networks"
-msgstr "Pokaż sieci Dropsa ad-hoc"
+msgstr "Pokaż sieci ad-hoc systemu Bajtek.edu.pl"
 
 #: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
@@ -933,7 +935,8 @@ msgid ""
 "    "
 msgstr ""
 "Sposób użycia: sugar-control-panel [ opcja ] zmienna [ argumenty ... ] \n"
-"    Konfiguracja środowiska pracy Sugar, ustawianie zmiennych środowiska. \n"
+"    Konfiguracja środowiska pracy Bajtek.edu.pl, ustawianie zmiennych "
+"środowiska. \n"
 "    Opcje: \n"
 "    -h           pokazuje tę wiadomość i kończy pracę \n"
 "    -l           pokazuje listę wszystkich dostępnych opcji \n"
@@ -945,28 +948,28 @@ msgstr ""
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
-msgstr "Aby zastosować zmiany należy uruchomić ponownie Dropsa. \n"
+msgstr "Aby zastosować zmiany należy uruchomić ponownie system Bajtek.edu.pl.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Uwaga"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Zmiany wymagają ponownego uruchomienia systemu"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Anuluj zmiany"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Później"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Restartuj teraz"
 
@@ -1001,7 +1004,7 @@ msgstr "Zachowaj"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Usuń"
@@ -1073,7 +1076,7 @@ msgstr "Uaktualnienie oprogramowania"
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 "Uaktualnij swoje Aktywności aby zapewnić ich zgodność z twoim nowym "
-"oprogramowaniem."
+"oprogramowaniem"
 
 #: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
@@ -1095,25 +1098,32 @@ msgstr "Widok ulubionych"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Rodzaj klucza:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Rodzaj uwierzytelniania:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Zabezpieczenia sieci bezprzewodowej:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Wznów"
@@ -1123,13 +1133,14 @@ msgstr "Wznów"
 msgid "Join"
 msgstr "Dołącz"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
-msgstr "Sieć ad-hoc &d"
+msgstr "Sieć ad-hoc %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format, 
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
+#, python-format,
 msgid "Mesh Network %d"
 msgstr "Sieć kratowa %d"
 
@@ -1211,7 +1222,8 @@ msgid "Open with"
 msgstr "Otwórz za pomocą"
 
 #: ../src/jarabe/frame/clipboardobject.py:50
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "%s clipping"
 msgstr "%s przcinanie (do schowka)"
 
@@ -1300,101 +1312,101 @@ msgid "Tags:"
 msgstr "Etykiety:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Dziennik"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Kiedykolwiek"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Dziś"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Od wczoraj"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Tydzień wstecz"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Miesiąc wstecz"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Rok wstecz"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Ktokolwiek"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Moi przyjaciele"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Moja klasa"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Cokolwiek"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Kopiuj do"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Duplikuj"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Błąd podczas kopiowania wpisu: %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr "Błąd"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Uruchom"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Sortuj wg daty modyfikacji"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Sortuj wg daty utworzenia"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Sortuj wg rozmiaru"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "Sortowanie"
 
@@ -1471,7 +1483,7 @@ msgstr "Pokaż szczegóły"
 
 #: ../src/jarabe/journal/palettes.py:160
 msgid "Entries without a file cannot be sent."
-msgstr "Wpisy bez pliku nie zostaną wysłane"
+msgstr "Wpisy bez pliku nie zostaną wysłane."
 
 #: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
 #: ../src/jarabe/journal/volumestoolbar.py:306
@@ -1636,7 +1648,7 @@ msgstr "Nie powiodła się inicjalizacja modemu."
 
 #: ../src/jarabe/model/network.py:224
 msgid "Failed to select the specified GSM APN"
-msgstr "Nie można wybrać podanego APN sieci GSM."
+msgstr "Nie można wybrać podanego APN sieci GSM"
 
 #: ../src/jarabe/model/network.py:226
 msgid "Not searching for networks."
@@ -1718,7 +1730,7 @@ msgstr "Nie udało się uruchomić <b>%s</b>."
 
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
-msgstr "Uruchamianie"
+msgstr "Uruchamianie..."
 
 #: ../src/jarabe/view/palettes.py:58
 msgid "Activity failed to start"
@@ -1760,7 +1772,7 @@ msgstr "Źródło pakietu czynności"
 
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
-msgstr "Źródło Narzędzi Dropsa"
+msgstr "Źródło Narzędzi systemu Bajtek.edu.pl"
 
 #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
@@ -1769,7 +1781,7 @@ msgstr "Pokaż źródło: %r"
 
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
-msgstr "Drops w oknie"
+msgstr "Bajtek.edu.pl w oknie"
 
 #~ msgid "Pick a buddy picture"
 #~ msgstr "Wybierz obrazek znajomego"
diff --git a/po/ps.po b/po/ps.po
index cd1dcde..2f4abe9 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-01-09 11:20+0000\n"
 "Last-Translator: usman mansoor ansari <jalalkut@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,48 +60,48 @@ msgstr "د رنګ بدلون لپاره ټك كړئ:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -109,7 +109,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -143,6 +143,7 @@ msgid "instantaneous"
 msgstr ""
 
 #: ../extensions/cpsection/frame/view.py:29
+#, python-format
 #, python-format, fuzzy
 msgid "%s seconds"
 msgstr "%d ثانيې"
@@ -436,25 +437,25 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 #, fuzzy
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -483,9 +484,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -544,20 +545,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "مېش جال"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "مېش جال"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -909,26 +911,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "د بدلونونو كارولو لپاره تاسې بايد شوګر بیاپیل كړئ.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -963,7 +965,7 @@ msgstr "خوندي كول"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1055,25 +1057,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "كلي ځېل:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "د كره توب ځېل:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "کارمخینه"
@@ -1083,12 +1092,13 @@ msgstr "کارمخینه"
 msgid "Join"
 msgstr "يوځايېنه"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "مېش جال"
@@ -1261,101 +1271,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/pseudo.po b/po/pseudo.po
deleted file mode 100644
index e184567..0000000
--- a/po/pseudo.po
+++ /dev/null
@@ -1,517 +0,0 @@
-# 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/po/pt.po b/po/pt.po
index cf4866f..0760ec7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@ 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: 2012-01-18 22:01+0200\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-03-09 00:53+0200\n"
 "Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pt\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
-msgstr "Sobre mim"
+msgstr "Sobre Mim"
 
 #: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
@@ -28,7 +28,7 @@ msgstr "Precisas de introduzir um nome."
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
-msgstr "traço:   cor=%s tonalidade=%s"
+msgstr "traço:   cor=%s tom=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
@@ -38,7 +38,7 @@ msgstr "traço:   %s"
 #: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
-msgstr "preenchimento:     cor=%s tonalidade=%s"
+msgstr "preenchimento:     cor=%s tom=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
@@ -61,48 +61,48 @@ msgstr "Clica para mudar a tua cor:"
 msgid "About my Computer"
 msgstr "Sobre o meu Computador"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Indisponível"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Número de Série:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
-msgstr "Sistema Operativo:"
+msgstr "Build:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
-msgstr "Firmware da rede sem fios:"
+msgstr "Firmware da Rede Sem Fios:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Copyright e Licença"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -114,7 +114,7 @@ msgstr ""
 "a fazer alterações a ele e/ou a distribuir cópias dele, segundo certas "
 "condições descritas a seguir."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Licença Completa:"
 
@@ -128,7 +128,7 @@ msgstr "Erro: fuso horário não existe."
 
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
-msgstr "Fuso horário"
+msgstr "Fuso Horário"
 
 #: ../extensions/cpsection/frame/__init__.py:21
 msgid "Frame"
@@ -145,7 +145,7 @@ msgstr "nunca"
 
 #: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
-msgstr "instantâneo"
+msgstr "imediato"
 
 #: ../extensions/cpsection/frame/view.py:29
 #, python-format
@@ -154,7 +154,7 @@ msgstr "%s segundos"
 
 #: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
-msgstr "Atraso na Activação"
+msgstr "Demora da Ativação"
 
 #: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
@@ -171,7 +171,7 @@ msgstr "Teclado"
 
 #: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
-msgstr "Modelo de teclado"
+msgstr "Modelo de Teclado"
 
 #: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
@@ -179,12 +179,12 @@ msgstr "Tecla(s) para alterar disposição"
 
 #: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
-msgstr "Disposições de teclado"
+msgstr "Disposições de Teclado"
 
 #: ../extensions/cpsection/language/__init__.py:21
 #: ../extensions/cpsection/language/view.py:33
 msgid "Language"
-msgstr "Linguagem"
+msgstr "Idioma"
 
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
@@ -193,7 +193,7 @@ msgstr "Não foi possível aceder a ~/.i18n. Cria definições normais."
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
-msgstr "Não foi possível determinar a linguagem para o código=%s."
+msgstr "Não foi possível determinar o idioma para o código=%s."
 
 #: ../extensions/cpsection/language/model.py:152
 #, python-format
@@ -206,7 +206,7 @@ msgid ""
 "the next in the list will be used."
 msgstr ""
 "Adiciona linguagens na ordem que preferires. Se uma tradução não estiver "
-"disponível, será usada a próxima na lista."
+"disponível, será utilizada a próxima da lista."
 
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
 msgid "Modem Configuration"
@@ -263,11 +263,11 @@ msgstr "Erro no argumento especificado, utiliza 0/1."
 
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
-msgstr "Rede sem fios"
+msgstr "Rede Sem Fios"
 
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
-msgstr "Desliga o rádio da rede sem fios para poupar no tempo de bateria"
+msgstr "Desliga o rádio da rede sem fios para poupar na carga de bateria"
 
 #: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
@@ -275,11 +275,11 @@ msgstr "Rádio"
 
 #: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
-msgstr "Descarta o histórico da rede se tiveres problemas em ligares-te à rede"
+msgstr "Descarta o histórico de rede se tiveres problemas em ligar à rede"
 
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
-msgstr "Descartar histórico da rede"
+msgstr "Descartar histórico de rede"
 
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
@@ -291,7 +291,7 @@ msgid ""
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
-"O servidor é o equivalente a em que qual quarto estás tu; pessoas no mesmo "
+"O servidor é o equivalente ao quarto em que tu estás; pessoas no mesmo "
 "servidor poderão ver-se umas às outras, mesmo que não estejam na mesma rede."
 
 #: ../extensions/cpsection/network/view.py:140
@@ -327,14 +327,14 @@ msgstr ""
 
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
-msgstr "Actualização de software"
+msgstr "Atualização de Software"
 
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
-"Actualizações de software corrigem erros, eliminam vulnerabilidades de "
+"Atualizações de software corrigem erros, eliminam vulnerabilidades de "
 "segurança, e fornecem novas funcionalidades."
 
 #: ../extensions/cpsection/updater/view.py:125
@@ -350,37 +350,37 @@ msgstr "A transferir %s..."
 #: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
-msgstr "A actualizar %s..."
+msgstr "A atualizar %s..."
 
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
-msgstr "O teu software está actualizado"
+msgstr "O teu software está atualizado"
 
 #: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Podes instalar %s actualização"
-msgstr[1] "Podes instalar %s actualizações"
+msgstr[0] "Podes instalar %s atualização"
+msgstr[1] "Podes instalar %s atualizações"
 
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
-msgstr "A verificar actualizações..."
+msgstr "A verificar atualizações..."
 
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
-msgstr "A instalar actualizações..."
+msgstr "A instalar atualizações..."
 
 #: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
-msgstr[0] "%s actualização foi instalada"
-msgstr[1] "%s actualizações foram instaladas"
+msgstr[0] "%s atualização foi instalada"
+msgstr[1] "%s atualizações foram instaladas"
 
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
-msgstr "Instalação selecionada"
+msgstr "Instalar selecionados"
 
 #: ../extensions/cpsection/updater/view.py:276
 #, python-format
@@ -388,8 +388,8 @@ msgid "Download size: %s"
 msgstr "Tamanho da transferência: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
-#, python-format, 
 #, python-format
+#, python-format,
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr "Da versão %(current)s para a versão %(new)s (Tamanho: %(size)s)"
 
@@ -417,7 +417,7 @@ msgstr "%.1f MB"
 
 #: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
-msgstr "A minha bateria"
+msgstr "Minha Bateria"
 
 #: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
@@ -425,11 +425,11 @@ msgstr "Removida"
 
 #: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
-msgstr "A carregar"
+msgstr "A recarregar"
 
 #: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
-msgstr "Resta muito pouca energia"
+msgstr "Muito pouca energia restante"
 
 #: ../extensions/deviceicon/battery.py:158
 #, python-format
@@ -438,7 +438,7 @@ msgstr "%(hour)d:%(min).2d restantes"
 
 #: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
-msgstr "Carregada"
+msgstr "Recarregada"
 
 #: ../extensions/deviceicon/network.py:49
 #, python-format
@@ -447,8 +447,8 @@ msgstr "Endereço IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Desligar"
 
@@ -458,18 +458,18 @@ msgstr "Desligar"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "A Ligar..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Ligado"
 
@@ -483,7 +483,7 @@ msgstr "Canal"
 
 #: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
-msgstr "Rede com fios"
+msgstr "Rede Com Fios"
 
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
@@ -498,9 +498,9 @@ msgid "Please wait..."
 msgstr "Por favor aguarda..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Ligar"
 
@@ -538,18 +538,18 @@ msgstr "Ligado há %s"
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
-#, python-format, 
 #, python-format
+#, python-format,
 msgid "%d KB"
 msgstr "%d KB"
 
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
-msgstr "Verifica a configuração do PIN/PUK."
+msgstr "Verifica a configuração do teu PIN/PUK."
 
 #: ../extensions/deviceicon/network.py:364
 msgid "Check your Access Point Name (APN) configuration"
-msgstr "Verifica a configuração do Nome do Ponto de Acesso (APN)"
+msgstr "Verifica a configuração do teu Nome do Ponto de Acesso (APN)"
 
 #: ../extensions/deviceicon/network.py:368
 msgid "Check the Number configuration."
@@ -557,33 +557,33 @@ msgstr "Verifica a configuração do Número."
 
 #: ../extensions/deviceicon/network.py:370
 msgid "Check your configuration."
-msgstr "Verifica a configuração."
+msgstr "Verifica a tua configuração."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Rede Mesh"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, 
+#: ../extensions/deviceicon/network.py:659
 #, python-format
+#, python-format,
 msgid "Mesh Network %s"
 msgstr "Rede Mesh %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Nenhuma ligação GSM disponível."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
-msgstr "Criar uma ligação no painel de controlo."
+msgstr "Cria uma ligação no painel de controlo."
 
 #: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
-msgstr "Os meus altifalantes"
+msgstr "Meus Altifalantes"
 
 #: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
-msgstr "Retirar do silêncio"
+msgstr "Retirar do Silêncio"
 
 #: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
@@ -599,7 +599,7 @@ msgstr "caneta"
 
 #: ../extensions/deviceicon/touchpad.py:68
 msgid "My touchpad"
-msgstr "O meu touchpad"
+msgstr "Meu touchpad"
 
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
@@ -618,11 +618,11 @@ msgstr "Casa"
 #: ../extensions/globalkey/screenshot.py:69
 #: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
-msgstr "Actividade"
+msgstr "Atividade"
 
 #: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
-msgstr "Captura de ecrã"
+msgstr "Captura de Ecrã"
 
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
@@ -639,15 +639,15 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
-msgstr "Directórios adicionais que podem conter traduções actualizadas."
+msgstr "Diretórios adicionais que podem conter traduções atualizadas."
 
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
-msgstr "URL da cópia de segurança"
+msgstr "URL da Cópia de Segurança"
 
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
-msgstr "Identificações (Bundle IDs) de actividades protegidas"
+msgstr "Bundle IDs de atividades protegidas"
 
 #: ../data/sugar.schemas.in.h:5
 msgid ""
@@ -655,13 +655,13 @@ msgid ""
 "composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
-"A cor do ícone XO que é utilizada em todo o ambiente gráfico. O texto é "
-"composto pela cor de traço e de preenchimento, e o formato é o das cores "
-"rgb. Por exemplo: #AC32FF, #9A5200"
+"A cor do ícone XO que é utilizada no ambiente gráfico. O texto é composto "
+"pela cor de traço e de preenchimento, e o formato é o das cores rgb. Por "
+"exemplo: #AC32FF, #9A5200"
 
 #: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
-msgstr "Atraso nos cantos"
+msgstr "Demora no Canto"
 
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
@@ -677,23 +677,23 @@ msgstr "Nome por omissão"
 
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr "Atraso na activação da moldura utilizando os cantos."
+msgstr "Demora da ativação da moldura utilizando os cantos."
 
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
-msgstr "Atraso na activação da moldura utilizando os lados."
+msgstr "Demora da ativação da moldura utilizando os lados."
 
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
-msgstr "Directório para procurar por traduções"
+msgstr "Diretório para procurar por traduções"
 
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
-msgstr "Atraso nos lados"
+msgstr "Demora no Lado"
 
 #: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
-msgstr "Disposição dos favoritos"
+msgstr "Disposição dos Favoritos"
 
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
@@ -701,11 +701,11 @@ msgstr "Modo de continuação dos favoritos"
 
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
-msgstr "Tipo de letra que é utilizado em todo o ambiente gráfico."
+msgstr "Tipo de letra que é utilizado no ambiente gráfico."
 
 #: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
-msgstr "Tamanho de letra que é utilizado em todo o ambiente gráfico."
+msgstr "Tamanho de letra que é utilizado no ambiente gráfico."
 
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
@@ -729,11 +729,11 @@ msgstr "Número da rede GSM"
 
 #: ../data/sugar.schemas.in.h:23
 msgid "GSM network password"
-msgstr "Palavra-Chave da rede GSM"
+msgstr "Palavra-Passe da rede GSM"
 
 #: ../data/sugar.schemas.in.h:24
 msgid "GSM network password configuration"
-msgstr "Configuração da palavra-chave da rede GSM"
+msgstr "Configuração da palavra-passe da rede GSM"
 
 #: ../data/sugar.schemas.in.h:25
 msgid "GSM network personal identification number configuration"
@@ -792,7 +792,7 @@ msgstr "Disposições de teclado"
 
 #: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
-msgstr "Modelos de teclado"
+msgstr "Modelo de teclado"
 
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
@@ -811,23 +811,23 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
-msgstr "Lista de opções do teclado."
+msgstr "Lista de opções de teclado."
 
 #: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
-msgstr "Energia automática"
+msgstr "Energia Automática"
 
 #: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
-msgstr "Energia automática."
+msgstr "Energia Automática."
 
 #: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
-msgstr "Energia extrema"
+msgstr "Energia Extrema"
 
 #: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
-msgstr "Energia extrema."
+msgstr "Energia Extrema."
 
 #: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
@@ -839,19 +839,19 @@ msgstr "Definição para silenciar o dispositivo de som."
 
 #: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
-msgstr "Mostrar Terminar a sessão"
+msgstr "Mostrar Terminar Sessão"
 
 #: ../data/sugar.schemas.in.h:48
 msgid "Show Restart"
-msgstr "Mostar Reiniciar"
+msgstr "Mostrar Reiniciar"
 
 #: ../data/sugar.schemas.in.h:49
 msgid "Show Sugar Ad-hoc networks"
-msgstr "Mostrar redes Ad-hoc do Sugar"
+msgstr "Mostrar redes Ad-hoc no Sugar"
 
 #: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
-msgstr "Som silenciado"
+msgstr "Som Silenciado"
 
 #: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
@@ -867,30 +867,30 @@ msgstr "O URL do servidor jabber a utilizar."
 
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
-msgstr "O URL onde a cópia de segurança é guardada."
+msgstr "O URL onde a Cópia de Segurança é gravada."
 
 #: ../data/sugar.schemas.in.h:56
 msgid "User Color"
-msgstr "Cor do utilizador"
+msgstr "Cor do Utilizador"
 
 #: ../data/sugar.schemas.in.h:57
 msgid "User Name"
-msgstr "Nome do utilizador"
+msgstr "Nome do Utilizador"
 
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
-msgstr "Nome do utilizador que é utilizado em todo o ambiente gráfico."
+msgstr "Nome do utilizador que é utilizado no ambiente gráfico."
 
 #: ../data/sugar.schemas.in.h:59
 msgid ""
 "Users will not be allowed to erase these activities through the list view."
 msgstr ""
-"Não será permitido aos utilizadores eliminarem estas actividades na visão em "
+"Não será permitido aos utilizadores eliminarem estas atividades na vista de "
 "lista."
 
 #: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
-msgstr "Volume de som"
+msgstr "Volume de Som"
 
 #: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
@@ -902,7 +902,7 @@ msgid ""
 "for that activity to be resumed."
 msgstr ""
 "Quando está no modo de continuação, clicar num ícone favorito irá fazer com "
-"que seja continuada a última entrada dessa actividade."
+"que seja continuada a última entrada dessa atividade."
 
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
@@ -910,7 +910,7 @@ msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
 msgstr ""
-"sugar-control-panel: AVISO, foram encontradas múltiplas opções com o mesmo "
+"sugar-control-panel: AVISO, foram encontradas mais que uma opção com o mesmo "
 "nome: módulo %s: %r"
 
 #: ../src/jarabe/controlpanel/cmd.py:30
@@ -946,35 +946,35 @@ msgstr ""
 "    -h           mostrar esta mensagem de ajuda e sair \n"
 "    -l           listar todas as opções disponíveis \n"
 "    -h key       mostrar informação sobre esta chave \n"
-"    -g key       obter o valor actual desta chave \n"
-"    -s key       colocar o valor actual desta chave \n"
-"    -c key       eliminar o valor actual desta chave \n"
+"    -g key       obter o valor atual desta chave \n"
+"    -s key       colocar o valor atual desta chave \n"
+"    -c key       eliminar o valor atual desta chave \n"
 "    "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Para aplicar as alterações tens que reiniciar o Sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Aviso"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
-msgstr "As alterações feitas necessitam que reinicies"
+msgstr "As alterações necessitam que reinicies"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Cancelar alterações"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Mais tarde"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Reiniciar agora"
 
@@ -1013,7 +1013,7 @@ msgstr "Guardar"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Apagar"
@@ -1030,7 +1030,7 @@ msgstr "Tornar favorito"
 #. TRANS: label for the freeform layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
-msgstr "Disposição livre"
+msgstr "Disposição Livre"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
@@ -1067,7 +1067,7 @@ msgstr "%s"
 
 #: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
-msgstr "O Registo teve sucesso"
+msgstr "O Registo teve Sucesso"
 
 #: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
@@ -1080,17 +1080,17 @@ msgstr "Registar"
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
 msgid "Register again"
-msgstr "Registar Novamente"
+msgstr "Registar novamente"
 
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
-msgstr "Actualização de software"
+msgstr "Atualização de Software"
 
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
-"Actualiza as tuas actividades para assegurar a compatibilidade com o teu "
-"novo software"
+"Atualiza as tuas atividades para assegurar compatibilidade com o teu novo "
+"software"
 
 #: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
@@ -1098,7 +1098,7 @@ msgstr "Verificar agora"
 
 #: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
-msgstr "Vista de lista"
+msgstr "Vista de Lista"
 
 #: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
@@ -1106,32 +1106,39 @@ msgstr "<Ctrl>2"
 
 #: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
-msgstr "Vista de favoritos"
+msgstr "Vista de Favoritos"
 
 #: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
-msgstr "Tipo de chave:"
+msgstr "Tipo de Chave:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tipo de Autenticação:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
-msgstr "WPA e WPA2 pessoal"
+msgstr "WPA e WPA2 Pessoal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
-msgstr "Segurança da rede sem fios:"
+msgstr "Segurança da Rede Sem Fios:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Continuar"
@@ -1141,14 +1148,14 @@ msgstr "Continuar"
 msgid "Join"
 msgstr "Entrar"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Rede Ad-hoc %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format, 
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
+#, python-format,
 msgid "Mesh Network %d"
 msgstr "Rede Mesh %d"
 
@@ -1186,7 +1193,8 @@ msgid "%s of %s"
 msgstr "%s de %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer from %s"
 msgstr "Transferência de %s"
 
@@ -1211,7 +1219,8 @@ msgid "The other participant canceled the file transfer"
 msgstr "O outro participante cancelou a transferência de ficheiro"
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer to %s"
 msgstr "Transferir para %s"
 
@@ -1274,7 +1283,7 @@ msgstr "Próximo"
 #: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
 #: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
-msgstr "Sem título"
+msgstr "Sem Título"
 
 #: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
@@ -1319,81 +1328,81 @@ msgid "Tags:"
 msgstr "Etiquetas:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Diário"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Procurar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
-msgstr "Qualquer altura"
+msgstr "Qualquer Altura"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Hoje"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Desde ontem"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
-msgstr "Esta semana"
+msgstr "Última semana"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
-msgstr "Este mês"
+msgstr "Último mês"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
-msgstr "Este ano"
+msgstr "Último ano"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
-msgstr "Qualquer pessoa"
+msgstr "Qualquer Pessoa"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
-msgstr "Os meus amigos"
+msgstr "Meus amigos"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
-msgstr "A minha turma"
+msgstr "Minha turma"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
-msgstr "Qualquer coisa"
+msgstr "Qualquer Coisa"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Copiar para"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Erro ao copiar a entrada. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1401,24 +1410,24 @@ msgstr "Erro"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Ordenar por data de modificação"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Ordenar por data de criação"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Ordenar por tamanho"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "Vista de ordenação"
 
@@ -1445,12 +1454,12 @@ msgstr "Limpar a busca"
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
 msgid "Older Version Of %s Activity"
-msgstr "Versão mais antiga da Actividade %s"
+msgstr "Versão Mais Antiga da Atividade %s"
 
 #: ../src/jarabe/journal/misc.py:274
 #, python-format
 msgid "Do you want to downgrade to version %s"
-msgstr "Queres fazer o downgrade para a versão %s"
+msgstr "Queres reverter para a versão %s"
 
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
@@ -1464,7 +1473,7 @@ msgstr ""
 
 #: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
-msgstr "Mostrar o diário"
+msgstr "Mostrar Diário"
 
 #: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
@@ -1485,7 +1494,7 @@ msgstr "Iniciar com"
 
 #: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
 msgid "No activity to start entry"
-msgstr "Não existe nenhuma actividade para iniciar a entrada"
+msgstr "Nenhuma atividade para iniciar a entrada"
 
 #: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
@@ -1506,19 +1515,19 @@ msgstr "Não podem ser copiadas entradas sem ficheiro."
 
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
-msgstr "Área de transferência"
+msgstr "Área de Transferência"
 
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
-msgstr "Não está presente nenhum amigo"
+msgstr "Nenhum amigo presente"
 
 #: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
-msgstr "Não foi encontrada uma ligação válida"
+msgstr "Nenhuma ligação válida encontrada"
 
 #: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
-msgstr "Não existe nenhuma actividade para continuar a entrada"
+msgstr "Nenhuma atividade para continuar a entrada"
 
 #: ../src/jarabe/journal/volumestoolbar.py:209
 msgid "Documents"
@@ -1611,7 +1620,7 @@ msgstr "O serviço DHCP fechou ou falhou inesperadamente."
 
 #: ../src/jarabe/model/network.py:201
 msgid "The shared connection service failed to start."
-msgstr "O serviço de ligação partilhada falhou ao iniciar."
+msgstr "O serviço de ligação partilhada falhou a iniciar."
 
 #: ../src/jarabe/model/network.py:203
 msgid "The shared connection service quit or failed unexpectedly."
@@ -1619,7 +1628,7 @@ msgstr "O serviço de ligação partilhada fechou ou falhou inesperadamente."
 
 #: ../src/jarabe/model/network.py:206
 msgid "The AutoIP service failed to start."
-msgstr "O serviço AutoIP falhou ao iniciar."
+msgstr "O serviço AutoIP falhou a iniciar."
 
 #: ../src/jarabe/model/network.py:208
 msgid "The AutoIP service reported an unexpected error."
@@ -1691,7 +1700,7 @@ msgstr "O NetworkManager adormeceu."
 
 #: ../src/jarabe/model/network.py:242
 msgid "The device's active connection was removed or disappeared."
-msgstr "A ligação activa do dispositivo foi removida ou desapareceu."
+msgstr "A ligação ativa do dispositivo foi removida ou desapareceu."
 
 #: ../src/jarabe/model/network.py:245
 msgid "A user or client requested the disconnection."
@@ -1719,11 +1728,11 @@ msgstr "Reiniciar"
 
 #: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
-msgstr "Terminar a sessão"
+msgstr "Terminar Sessão"
 
 #: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
-msgstr "As minhas definições"
+msgstr "Minhas Definições"
 
 #: ../src/jarabe/view/buddymenu.py:142
 #, python-format
@@ -1742,12 +1751,12 @@ msgstr "A Iniciar..."
 
 #: ../src/jarabe/view/palettes.py:58
 msgid "Activity failed to start"
-msgstr "A actividade falhou a iniciar"
+msgstr "A atividade falhou a iniciar"
 
 #. TODO: share-with, keep
 #: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
-msgstr "Ver código-fonte"
+msgstr "Ver Código-fonte"
 
 #: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2b7c63e..d0f14b9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-10-15 14:10+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-docs-br@redhat.com>\n"
@@ -61,48 +61,48 @@ msgstr "Clique para mudar a cor:"
 msgid "About my Computer"
 msgstr "Sobre meu Computador"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Não disponível"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Número de Série:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Construção:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Firmware sem Fio:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Direito Autoral e Licença"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -114,7 +114,7 @@ msgstr ""
 "convidado(a) para modificá-lo e/ou distribuir copias dele, sob certas "
 "condições descritas na Licença."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Licença Completa:"
 
@@ -450,8 +450,8 @@ msgstr "Endereço IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Desconectar"
 
@@ -463,17 +463,17 @@ msgstr "Desconectar"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Conectando..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Conectado"
 
@@ -503,9 +503,9 @@ msgid "Please wait..."
 msgstr "Por favor espere..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Conectar"
 
@@ -533,6 +533,7 @@ msgid "Error: %s"
 msgstr "Erro: %s"
 
 #: ../extensions/deviceicon/network.py:340
+#, python-format
 #, python-format, fuzzy
 msgid "Suggestion: %s"
 msgstr "Sugestão: %s"
@@ -544,6 +545,7 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
+#, python-format
 #, python-format, fuzzy
 msgid "%d KB"
 msgstr "%dKB"
@@ -564,21 +566,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Rede Mesh"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
-#, python-format, 
+#, python-format,
 msgid "Mesh Network %s"
 msgstr "Rede Mesh %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -956,26 +958,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Para terminar suas mudanças você deve reiniciar o sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Aviso"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "As mudanças exigem um reinício"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Cancele as mudanças"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Posterior"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Reiniciar agora"
 
@@ -1010,7 +1012,7 @@ msgstr "Manter"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Apagar"
@@ -1105,25 +1107,32 @@ msgstr "Visão de favoritos"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tipo de chave:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tipo de Autenticação:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Pessoal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Segurança do Wireless:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Continuar"
@@ -1133,12 +1142,12 @@ msgstr "Continuar"
 msgid "Join"
 msgstr "Juntar-se"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 #, python-format,
 msgid "Mesh Network %d"
@@ -1311,81 +1320,81 @@ msgid "Tags:"
 msgstr "Etiquetas:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Diário"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Buscar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Em qualquer momento"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Hoje"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Desde ontem"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Última semana"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Último mês"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Último ano"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Meus amigos"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Minha turma"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Qualquer coisa"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Copiar para"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1393,24 +1402,24 @@ msgstr "Erro"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
@@ -1719,6 +1728,7 @@ msgid "Invite to %s"
 msgstr "Convidar para %s"
 
 #: ../src/jarabe/view/launcher.py:145
+#, python-format
 #, python-format, fuzzy
 msgid "<b>%s</b> failed to start."
 msgstr "<b>%s</b> falha ao iniciar."
diff --git a/po/qqa.po b/po/qqa.po
deleted file mode 100644
index b42ad7e..0000000
--- a/po/qqa.po
+++ /dev/null
@@ -1,2140 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 07:47-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
-
-#  "Acerca de mí"
-#: ../extensions/cpsection/aboutme/__init__.py:24
-msgid "About Me"
-msgstr ""
-
-#  "Debe ingresar un nombre."
-#: ../extensions/cpsection/aboutme/model.py:48
-msgid "You must enter a name."
-msgstr ""
-
-#  "borde:   color=%s tonalidad=%s"
-#: ../extensions/cpsection/aboutme/model.py:75
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr ""
-
-#  "borde:   %s"
-#: ../extensions/cpsection/aboutme/model.py:78
-#, python-format
-msgid "stroke:   %s"
-msgstr ""
-
-#  "relleno:     color=%s tonalidad=%s"
-#: ../extensions/cpsection/aboutme/model.py:80
-#, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr ""
-
-#  "relleno:     %s"
-#: ../extensions/cpsection/aboutme/model.py:82
-#, python-format
-msgid "fill:     %s"
-msgstr ""
-
-#  "Error en modificadores de color especificados."
-#: ../extensions/cpsection/aboutme/model.py:94
-msgid "Error in specified color modifiers."
-msgstr ""
-
-#  "Error en colores especificados."
-#: ../extensions/cpsection/aboutme/model.py:97
-msgid "Error in specified colors."
-msgstr ""
-
-#  "Clic para cambiar su color:"
-#: ../extensions/cpsection/aboutme/view.py:235
-msgid "Click to change your color:"
-msgstr ""
-
-#  "Acerca de mi computadora"
-#: ../extensions/cpsection/aboutcomputer/__init__.py:21
-msgid "About my Computer"
-msgstr ""
-
-#  "No disponible"
-#: ../extensions/cpsection/aboutcomputer/model.py:42
-msgid "Not available"
-msgstr ""
-
-#  "%(interface)s: %(version)s"
-#: ../extensions/cpsection/aboutcomputer/model.py:171
-#, python-format
-msgid "%(interface)s: %(version)s"
-msgstr ""
-
-#  "Identidad"
-#: ../extensions/cpsection/aboutcomputer/view.py:61
-msgid "Identity"
-msgstr ""
-
-#  "Número de serie:"
-#: ../extensions/cpsection/aboutcomputer/view.py:70
-msgid "Serial Number:"
-msgstr ""
-
-#  "Software"
-#: ../extensions/cpsection/aboutcomputer/view.py:92
-msgid "Software"
-msgstr ""
-
-#  "Ensamble:"
-#: ../extensions/cpsection/aboutcomputer/view.py:101
-msgid "Build:"
-msgstr ""
-
-#  "Azúcar:"
-#: ../extensions/cpsection/aboutcomputer/view.py:116
-msgid "Sugar:"
-msgstr ""
-
-#  "Firmware:"
-#: ../extensions/cpsection/aboutcomputer/view.py:132
-msgid "Firmware:"
-msgstr ""
-
-#  "Firmware de la red inalámbrica:"
-#: ../extensions/cpsection/aboutcomputer/view.py:147
-msgid "Wireless Firmware:"
-msgstr ""
-
-#  "Licencia y derechos de autor"
-#: ../extensions/cpsection/aboutcomputer/view.py:170
-msgid "Copyright and License"
-msgstr ""
-
-
-#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
-#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
-#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
-#  "se describen en ella."
-#: ../extensions/cpsection/aboutcomputer/view.py:188
-msgid ""
-"Sugar is the graphical user interface that you are looking at. Sugar is free "
-"software, covered by the GNU General Public License, and you are welcome to "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
-msgstr ""
-
-#  "Licencia completa:"
-#: ../extensions/cpsection/aboutcomputer/view.py:200
-msgid "Full license:"
-msgstr ""
-
-#  "Fecha y hora"
-#: ../extensions/cpsection/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr ""
-
-#  "Error, zona horaria no existe."
-#: ../extensions/cpsection/datetime/model.py:92
-msgid "Error timezone does not exist."
-msgstr ""
-
-#  "Zona horaria"
-#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
-msgid "Timezone"
-msgstr ""
-
-#  "Cuadro"
-#: ../extensions/cpsection/frame/__init__.py:21
-msgid "Frame"
-msgstr ""
-
-#  "El valor debe ser un número entero."
-#: ../extensions/cpsection/frame/model.py:41
-#: ../extensions/cpsection/frame/model.py:66
-msgid "Value must be an integer."
-msgstr ""
-
-#  "nunca"
-#: ../extensions/cpsection/frame/view.py:27
-msgid "never"
-msgstr ""
-
-#  "instantáneo"
-#: ../extensions/cpsection/frame/view.py:28
-msgid "instantaneous"
-msgstr ""
-
-#  "%s segundos"
-#: ../extensions/cpsection/frame/view.py:29
-#, python-format
-msgid "%s seconds"
-msgstr ""
-
-#  "Retraso de activación"
-#: ../extensions/cpsection/frame/view.py:54
-msgid "Activation Delay"
-msgstr ""
-
-#  "Esquina"
-#: ../extensions/cpsection/frame/view.py:78
-msgid "Corner"
-msgstr ""
-
-#  "Borde"
-#: ../extensions/cpsection/frame/view.py:113
-msgid "Edge"
-msgstr ""
-
-#  "Teclado"
-#: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:32
-msgid "Keyboard"
-msgstr ""
-
-#  "Modelo de teclado"
-#: ../extensions/cpsection/keyboard/view.py:190
-msgid "Keyboard Model"
-msgstr ""
-
-#  "Tecla(s) para cambiar el diseño"
-#: ../extensions/cpsection/keyboard/view.py:250
-msgid "Key(s) to change layout"
-msgstr ""
-
-#  "Diseño(s) de teclado"
-#: ../extensions/cpsection/keyboard/view.py:319
-msgid "Keyboard Layout(s)"
-msgstr ""
-
-#  "Idioma"
-#: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:33
-msgid "Language"
-msgstr ""
-
-
-#  "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
-#: ../extensions/cpsection/language/model.py:30
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
-
-#  "El lenguaje del código=%s no pudo ser determinado."
-#: ../extensions/cpsection/language/model.py:129
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr ""
-
-#  "Lo siento, yo no hablo '%s'."
-#: ../extensions/cpsection/language/model.py:152
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr ""
-
-
-#  "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
-#  "disponible, se usará la siguiente en la lista."
-#: ../extensions/cpsection/language/view.py:57
-msgid ""
-"Add languages in the order you prefer. If a translation is not available, "
-"the next in the list will be used."
-msgstr ""
-
-#  "Configuración del módem"
-#: ../extensions/cpsection/modemconfiguration/__init__.py:21
-msgid "Modem Configuration"
-msgstr ""
-
-#  "Nombre de usuario:"
-#: ../extensions/cpsection/modemconfiguration/view.py:94
-msgid "Username:"
-msgstr ""
-
-#  "Contraseña:"
-#: ../extensions/cpsection/modemconfiguration/view.py:106
-msgid "Password:"
-msgstr ""
-
-#  "Número:"
-#: ../extensions/cpsection/modemconfiguration/view.py:118
-msgid "Number:"
-msgstr ""
-
-#  "Nombre de punto de acceso (APN):"
-#: ../extensions/cpsection/modemconfiguration/view.py:130
-msgid "Access Point Name (APN):"
-msgstr ""
-
-#  "Número de identificación personal (PIN):"
-#: ../extensions/cpsection/modemconfiguration/view.py:142
-msgid "Personal Identity Number (PIN):"
-msgstr ""
-
-#  "Clave personal de desbloqueo (PUK):"
-#: ../extensions/cpsection/modemconfiguration/view.py:154
-msgid "Personal Unblocking Key (PUK):"
-msgstr ""
-
-
-#  "Necesitará proveer la información siguiente para configurar una conexión de "
-#  "banda ancha (3G) de red de telefonía celular."
-#: ../extensions/cpsection/modemconfiguration/view.py:175
-msgid ""
-"You will need to provide the following information to set up a mobile "
-"broadband connection to a cellular (3G) network."
-msgstr ""
-
-#  "Red"
-#: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:29
-msgid "Network"
-msgstr ""
-
-#  "Estado desconocido."
-#: ../extensions/cpsection/network/model.py:71
-msgid "State is unknown."
-msgstr ""
-
-#  "Error en argumento especificado de radio use on/off."
-#: ../extensions/cpsection/network/model.py:99
-msgid "Error in specified radio argument use on/off."
-msgstr ""
-
-#  "Error en argumento especificado use 0/1."
-#: ../extensions/cpsection/network/model.py:140
-msgid "Error in specified argument use 0/1."
-msgstr ""
-
-#  "Inalámbrica"
-#: ../extensions/cpsection/network/view.py:61
-msgid "Wireless"
-msgstr ""
-
-#  "Apague la radio inalámbrica y ahorre vida de batería"
-#: ../extensions/cpsection/network/view.py:69
-msgid "Turn off the wireless radio to save battery life"
-msgstr ""
-
-#  "Radio"
-#: ../extensions/cpsection/network/view.py:82
-msgid "Radio"
-msgstr ""
-
-#  "Descarte el historial de la red si tiene problemas de conexión"
-#: ../extensions/cpsection/network/view.py:98
-msgid "Discard network history if you have trouble connecting to the network"
-msgstr ""
-
-#  "Descarte historial de la red"
-#: ../extensions/cpsection/network/view.py:107
-msgid "Discard network history"
-msgstr ""
-
-#  "Colaboración"
-#: ../extensions/cpsection/network/view.py:122
-msgid "Collaboration"
-msgstr ""
-
-
-#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
-#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
-#: ../extensions/cpsection/network/view.py:130
-msgid ""
-"The server is the equivalent of what room you are in; people on the same "
-"server will be able to see each other, even when they aren't on the same "
-"network."
-msgstr ""
-
-#  "Servidor:"
-#: ../extensions/cpsection/network/view.py:140
-msgid "Server:"
-msgstr ""
-
-#  "Energía"
-#: ../extensions/cpsection/power/__init__.py:21
-msgid "Power"
-msgstr ""
-
-#  "Error en argumento automático de manejo de energía, use on/off."
-#: ../extensions/cpsection/power/model.py:90
-msgid "Error in automatic pm argument, use on/off."
-msgstr ""
-
-#  "Error en argumento extremo de manejo de energía, use on/off."
-#: ../extensions/cpsection/power/model.py:120
-msgid "Error in extreme pm argument, use on/off."
-msgstr ""
-
-#  "Manejo de energía"
-#: ../extensions/cpsection/power/view.py:48
-msgid "Power management"
-msgstr ""
-
-#  "Manejo automático de energía (incrementa la vida de la batería)"
-#: ../extensions/cpsection/power/view.py:58
-msgid "Automatic power management (increases battery life)"
-msgstr ""
-
-
-#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
-#  "duración de la batería)"
-#: ../extensions/cpsection/power/view.py:86
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
-msgstr ""
-
-#  "Actualización de software"
-#: ../extensions/cpsection/updater/__init__.py:21
-msgid "Software update"
-msgstr ""
-
-
-#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
-#  "de seguridad y proveen nuevas características."
-#: ../extensions/cpsection/updater/view.py:63
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities, and "
-"provide new features."
-msgstr ""
-
-#  "Probando %s..."
-#: ../extensions/cpsection/updater/view.py:125
-#, python-format
-msgid "Checking %s..."
-msgstr ""
-
-#  "Descargando %s..."
-#: ../extensions/cpsection/updater/view.py:127
-#, python-format
-msgid "Downloading %s..."
-msgstr ""
-
-#  "Actualizando %s..."
-#: ../extensions/cpsection/updater/view.py:129
-#, python-format
-msgid "Updating %s..."
-msgstr ""
-
-#  "Tu software esta actualizado"
-#: ../extensions/cpsection/updater/view.py:139
-msgid "Your software is up-to-date"
-msgstr ""
-
-#  "Puedes instalar %s actualización"
-#  "Puedes instalar %s actualizaciones"
-#: ../extensions/cpsection/updater/view.py:141
-#, python-format
-msgid "You can install %s update"
-msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
-
-#  "Buscando actualizaciones..."
-#: ../extensions/cpsection/updater/view.py:159
-msgid "Checking for updates..."
-msgstr ""
-
-#  "Instalando actualizaciones..."
-#: ../extensions/cpsection/updater/view.py:164
-msgid "Installing updates..."
-msgstr ""
-
-#  "%s actualización fue instalada"
-#  "%s actualizaciones fueron instaladas"
-#: ../extensions/cpsection/updater/view.py:173
-#, python-format
-msgid "%s update was installed"
-msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
-
-#  "Instalación seleccionada"
-#: ../extensions/cpsection/updater/view.py:255
-msgid "Install selected"
-msgstr ""
-
-#  "Tamaño de descarga: %s"
-#: ../extensions/cpsection/updater/view.py:276
-#, python-format
-msgid "Download size: %s"
-msgstr ""
-
-#  "Desde la version %(current)s hacia %(new)s (Size: %(size)s)"
-#: ../extensions/cpsection/updater/view.py:364
-#, python-format
-msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
-
-#  "Ninguno"
-#. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:382
-msgid "None"
-msgstr ""
-
-#  "1 KB"
-#. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:385
-msgid "1 KB"
-msgstr ""
-
-#  "%.0f KB"
-#. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:388
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#  "%.1f MB"
-#. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:391
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
-#  "Mi batería"
-#: ../extensions/deviceicon/battery.py:71
-msgid "My Battery"
-msgstr ""
-
-#  "Eliminado"
-#: ../extensions/deviceicon/battery.py:147
-msgid "Removed"
-msgstr ""
-
-#  "Cargando"
-#: ../extensions/deviceicon/battery.py:150
-msgid "Charging"
-msgstr ""
-
-#  "Queda muy poca batería"
-#: ../extensions/deviceicon/battery.py:153
-msgid "Very little power remaining"
-msgstr ""
-
-#  "Quedan %(hour)d:%(min).2d"
-#: ../extensions/deviceicon/battery.py:158
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr ""
-
-#  "Cargada"
-#: ../extensions/deviceicon/battery.py:161
-msgid "Charged"
-msgstr ""
-
-#  "Direccion IP: %s"
-#: ../extensions/deviceicon/network.py:49
-#, python-format
-msgid "IP address: %s"
-msgstr ""
-
-#  "Desconectar"
-#: ../extensions/deviceicon/network.py:104
-#: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
-msgid "Disconnect"
-msgstr ""
-
-#  "Conectando..."
-#: ../extensions/deviceicon/network.py:112
-#: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
-msgid "Connecting..."
-msgstr ""
-
-#  "Conectado"
-#: ../extensions/deviceicon/network.py:117
-#: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
-msgid "Connected"
-msgstr ""
-
-#  "No hay conexión inalámbrica"
-#: ../extensions/deviceicon/network.py:130
-msgid "No wireless connection"
-msgstr ""
-
-#  "Canal"
-#: ../extensions/deviceicon/network.py:144
-msgid "Channel"
-msgstr ""
-
-#  "Red Cableada"
-#: ../extensions/deviceicon/network.py:159
-msgid "Wired Network"
-msgstr ""
-
-#  "Velocidad"
-#: ../extensions/deviceicon/network.py:188
-msgid "Speed"
-msgstr ""
-
-#  "Módem inalámbrico"
-#: ../extensions/deviceicon/network.py:213
-msgid "Wireless modem"
-msgstr ""
-
-#  "Espere por favor..."
-#: ../extensions/deviceicon/network.py:281
-msgid "Please wait..."
-msgstr ""
-
-#  "Conectar"
-#: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
-msgid "Connect"
-msgstr ""
-
-#  "Desconectado"
-#: ../extensions/deviceicon/network.py:287
-msgid "Disconnected"
-msgstr ""
-
-#  "Cancelar"
-#: ../extensions/deviceicon/network.py:294
-#: ../src/jarabe/controlpanel/toolbar.py:119
-#: ../src/jarabe/desktop/homebox.py:71
-#: ../src/jarabe/frame/activitiestray.py:602
-#: ../src/jarabe/frame/activitiestray.py:704
-#: ../src/jarabe/frame/activitiestray.py:732
-msgid "Cancel"
-msgstr ""
-
-#  "Probar la conexión nuevamente"
-#: ../extensions/deviceicon/network.py:333
-msgid "Try connection again"
-msgstr ""
-
-#  "Error: %s"
-#: ../extensions/deviceicon/network.py:336
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#  "Sugerencia: %s"
-#: ../extensions/deviceicon/network.py:340
-#, python-format
-msgid "Suggestion: %s"
-msgstr ""
-
-#  "Conectado a %s"
-#: ../extensions/deviceicon/network.py:349
-#, python-format
-msgid "Connected for %s"
-msgstr ""
-
-#  "%d KB"
-#: ../extensions/deviceicon/network.py:355
-#: ../extensions/deviceicon/network.py:356
-#, python-format
-msgid "%d KB"
-msgstr ""
-
-#  "Revise la configuración de su Pin/Puk."
-#: ../extensions/deviceicon/network.py:361
-msgid "Check your Pin/Puk configuration."
-msgstr ""
-
-#  "Revise la configuración del nombre de su punto de acceso (APN)"
-#: ../extensions/deviceicon/network.py:364
-msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
-
-#  "Revise el Número en la configuración."
-#: ../extensions/deviceicon/network.py:368
-msgid "Check the Number configuration."
-msgstr ""
-
-#  "Revise su configuración."
-#: ../extensions/deviceicon/network.py:370
-msgid "Check your configuration."
-msgstr ""
-
-#  "Red Malla"
-#: ../extensions/deviceicon/network.py:612
-msgid "Mesh Network"
-msgstr ""
-
-#  "Red Malla %s"
-#: ../extensions/deviceicon/network.py:656
-#, python-format
-msgid "Mesh Network %s"
-msgstr ""
-
-#  "No se dispone de conexión GSM."
-#: ../extensions/deviceicon/network.py:779
-msgid "No GSM connection available."
-msgstr ""
-
-#  "Crear una conexión en el panel de control."
-#: ../extensions/deviceicon/network.py:780
-msgid "Create a connection in the control panel."
-msgstr ""
-
-#  "Mis parlantes"
-#: ../extensions/deviceicon/speaker.py:61
-msgid "My Speakers"
-msgstr ""
-
-#  "Dar voz"
-#: ../extensions/deviceicon/speaker.py:138
-msgid "Unmute"
-msgstr ""
-
-#  "Silenciar"
-#: ../extensions/deviceicon/speaker.py:141
-msgid "Mute"
-msgstr ""
-
-#  "dedo"
-#: ../extensions/deviceicon/touchpad.py:38
-msgid "finger"
-msgstr ""
-
-#  "estilo"
-#: ../extensions/deviceicon/touchpad.py:39
-msgid "stylus"
-msgstr ""
-
-#  "Mi superficie táctil"
-#: ../extensions/deviceicon/touchpad.py:68
-msgid "My touchpad"
-msgstr ""
-
-#  "Malla"
-#: ../extensions/globalkey/screenshot.py:59
-msgid "Mesh"
-msgstr ""
-
-#  "Grupo"
-#: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "Group"
-msgstr ""
-
-#  "Hogar"
-#: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "Home"
-msgstr ""
-
-#  "Actividad"
-#: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "Activity"
-msgstr ""
-
-#  "Captura de pantalla"
-#: ../extensions/globalkey/screenshot.py:72
-msgid "Screenshot"
-msgstr ""
-
-#  "Captura pantalla de \"%s\""
-#: ../extensions/globalkey/screenshot.py:74
-#, python-format
-msgid "Screenshot of \"%s\""
-msgstr ""
-
-
-#  "\"disabled\" (desactivado) para preguntar apodo al inicio; \"system\" (sistema) "
-#  "para reutilizar el nombre largo de la cuenta UNIX."
-#: ../data/sugar.schemas.in.h:1
-msgid ""
-"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
-"long name."
-msgstr ""
-
-#  "Directorios adicionales que pueden contener traducciones actualizadas."
-#: ../data/sugar.schemas.in.h:2
-msgid "Additional directories which can contain updated translations."
-msgstr ""
-
-#  "URL de Respaldo"
-#: ../data/sugar.schemas.in.h:3
-msgid "Backup URL"
-msgstr ""
-
-#  "Bundle IDs de actividades protegidas"
-#: ../data/sugar.schemas.in.h:4
-msgid "Bundle IDs of protected activities"
-msgstr ""
-
-
-#  "El color para el ícono del XO se utiliza en todo el escritorio. La cadena "
-#  "está compuesta por el trazo y color de relleno de color, el formato es el de "
-#  "colores RGB. Ejemplo: #AC32FF, #9A5200"
-#: ../data/sugar.schemas.in.h:5
-msgid ""
-"Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rgb colors. "
-"Example: #AC32FF,#9A5200"
-msgstr ""
-
-#  "Retraso de las Esquinas"
-#: ../data/sugar.schemas.in.h:6
-msgid "Corner Delay"
-msgstr ""
-
-#  "Tipo de letra predeterminado"
-#: ../data/sugar.schemas.in.h:7
-msgid "Default font face"
-msgstr ""
-
-#  "Tamaño de letra predeterminado"
-#: ../data/sugar.schemas.in.h:8
-msgid "Default font size"
-msgstr ""
-
-#  "Apodo predeterminado"
-#: ../data/sugar.schemas.in.h:9
-msgid "Default nick"
-msgstr ""
-
-#  "Retraso para la activación del cuadro utilizando las esquinas."
-#: ../data/sugar.schemas.in.h:10
-msgid "Delay for the activation of the frame using the corners."
-msgstr ""
-
-#  "Retraso para la activación del cuadro utilizando los bordes."
-#: ../data/sugar.schemas.in.h:11
-msgid "Delay for the activation of the frame using the edges."
-msgstr ""
-
-#  "Directorio a buscar para traducciones"
-#: ../data/sugar.schemas.in.h:12
-msgid "Directory to search for translations"
-msgstr ""
-
-#  "Retraso del Borde"
-#: ../data/sugar.schemas.in.h:13
-msgid "Edge Delay"
-msgstr ""
-
-#  "Diseño de favoritos"
-#: ../data/sugar.schemas.in.h:14
-msgid "Favorites Layout"
-msgstr ""
-
-#  "Modo de reanudar favoritos"
-#: ../data/sugar.schemas.in.h:15
-msgid "Favorites resume mode"
-msgstr ""
-
-#  "Tipo de letra que se utiliza en todo el escritorio."
-#: ../data/sugar.schemas.in.h:16
-msgid "Font face that is used throughout the desktop."
-msgstr ""
-
-#  "Tamaño de letra que se utiliza en todo el escritorio."
-#: ../data/sugar.schemas.in.h:17
-msgid "Font size that is used throughout the desktop."
-msgstr ""
-
-#  "APN de la red GSM"
-#: ../data/sugar.schemas.in.h:18
-msgid "GSM network APN"
-msgstr ""
-
-#  "PIN de la red GSM"
-#: ../data/sugar.schemas.in.h:19
-msgid "GSM network PIN"
-msgstr ""
-
-#  "PUK de la red GSM"
-#: ../data/sugar.schemas.in.h:20
-msgid "GSM network PUK"
-msgstr ""
-
-#  "Configuración del nombre del punto de acceso (APN) de la red GSM"
-#: ../data/sugar.schemas.in.h:21
-msgid "GSM network access point name configuration"
-msgstr ""
-
-#  "Número de la red GSM"
-#: ../data/sugar.schemas.in.h:22
-msgid "GSM network number"
-msgstr ""
-
-#  "Contraseña de la red GSM"
-#: ../data/sugar.schemas.in.h:23
-msgid "GSM network password"
-msgstr ""
-
-#  "Configuración de la contraseña de la red GSM"
-#: ../data/sugar.schemas.in.h:24
-msgid "GSM network password configuration"
-msgstr ""
-
-#  "Configuración del numero de identificación personal (PIN) de la red GSM"
-#: ../data/sugar.schemas.in.h:25
-msgid "GSM network personal identification number configuration"
-msgstr ""
-
-#  "Configuración de la clave de desbloqueo personal (PUK) de la red GSM"
-#: ../data/sugar.schemas.in.h:26
-msgid "GSM network personal unlock key configuration"
-msgstr ""
-
-#  "Configuración del número de teléfono de la red GSM"
-#: ../data/sugar.schemas.in.h:27
-msgid "GSM network telephone number configuration"
-msgstr ""
-
-#  "Nombre de usuario de la red GSM"
-#: ../data/sugar.schemas.in.h:28
-msgid "GSM network username"
-msgstr ""
-
-#  "Configuración del nombre de usuario de la red GSM"
-#: ../data/sugar.schemas.in.h:29
-msgid "GSM network username configuration"
-msgstr ""
-
-
-#  "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor "
-#  "Jabber."
-#: ../data/sugar.schemas.in.h:30
-msgid ""
-"If TRUE, Sugar will make us searchable for the other users of the Jabber "
-"server."
-msgstr ""
-
-#  "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"."
-#: ../data/sugar.schemas.in.h:31
-msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
-
-#  "Si es TRUE, Azúcar mostrará una opción \"Reiniciar Sesión\"."
-#: ../data/sugar.schemas.in.h:32
-msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
-
-
-#  "Sí es TRUE, Azúcar mostrara las redes ad-hoc predefinidas para canales 1,6, "
-#  "y 11. Sí Azúcar no ve redes conocidas cuando inicia, se conectará "
-#  "automáticamente a una red ad-hoc."
-#: ../data/sugar.schemas.in.h:33
-msgid ""
-"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
-"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
-"hoc network."
-msgstr ""
-
-#  "Servidor Jabber"
-#: ../data/sugar.schemas.in.h:34
-msgid "Jabber Server"
-msgstr ""
-
-#  "Distribuciones del teclado"
-#: ../data/sugar.schemas.in.h:35
-msgid "Keyboard layouts"
-msgstr ""
-
-#  "Modelo del teclado"
-#: ../data/sugar.schemas.in.h:36
-msgid "Keyboard model"
-msgstr ""
-
-#  "Opciones del teclado"
-#: ../data/sugar.schemas.in.h:37
-msgid "Keyboard options"
-msgstr ""
-
-#  "Distribución de las actividades favoritas."
-#: ../data/sugar.schemas.in.h:38
-msgid "Layout of the favorites view."
-msgstr ""
-
-
-#  "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma "
-#  "distribución(variante)"
-#: ../data/sugar.schemas.in.h:39
-msgid ""
-"List of keyboard layouts. Each entry should be in the form layout(variant)"
-msgstr ""
-
-#  "Lista de las opciones del teclado."
-#: ../data/sugar.schemas.in.h:40
-msgid "List of keyboard options."
-msgstr ""
-
-#  "Manejo automática de energía"
-#: ../data/sugar.schemas.in.h:41
-msgid "Power Automatic"
-msgstr ""
-
-#  "Manejo automática de energía."
-#: ../data/sugar.schemas.in.h:42
-msgid "Power Automatic."
-msgstr ""
-
-#  "Manejo extremo de energía"
-#: ../data/sugar.schemas.in.h:43
-msgid "Power Extreme"
-msgstr ""
-
-#  "Manejo extremo de energía."
-#: ../data/sugar.schemas.in.h:44
-msgid "Power Extreme."
-msgstr ""
-
-#  "Publicar en Gadget"
-#: ../data/sugar.schemas.in.h:45
-msgid "Publish to Gadget"
-msgstr ""
-
-#  "Configuración para silenciar el dispositivo de sonido."
-#: ../data/sugar.schemas.in.h:46
-msgid "Setting for muting the sound device."
-msgstr ""
-
-#  "Mostrar Terminar Sesión"
-#: ../data/sugar.schemas.in.h:47
-msgid "Show Log out"
-msgstr ""
-
-#  "Mostrar Reiniciar"
-#: ../data/sugar.schemas.in.h:48
-msgid "Show Restart"
-msgstr ""
-
-#  "Mostrar redes específicas de Azúcar"
-#: ../data/sugar.schemas.in.h:49
-msgid "Show Sugar Ad-hoc networks"
-msgstr ""
-
-#  "Sonido silenciado"
-#: ../data/sugar.schemas.in.h:50
-msgid "Sound Muted"
-msgstr ""
-
-#  "El modelo del teclado que se utilizará"
-#: ../data/sugar.schemas.in.h:51
-msgid "The keyboard model to be used"
-msgstr ""
-
-#  "Configuración de zona horaria para el sistema."
-#: ../data/sugar.schemas.in.h:53
-msgid "Timezone setting for the system."
-msgstr ""
-
-#  "URL del servidor de Jabber para usar."
-#: ../data/sugar.schemas.in.h:54
-msgid "Url of the jabber server to use."
-msgstr ""
-
-#  "URL donde se guarda el backup."
-#: ../data/sugar.schemas.in.h:55
-msgid "Url where the backup is saved to."
-msgstr ""
-
-#  "Color del usuario"
-#: ../data/sugar.schemas.in.h:56
-msgid "User Color"
-msgstr ""
-
-#  "Nombre de usuario"
-#: ../data/sugar.schemas.in.h:57
-msgid "User Name"
-msgstr ""
-
-#  "Nombre de usuario que se utiliza en todo el escritorio."
-#: ../data/sugar.schemas.in.h:58
-msgid "User name that is used throughout the desktop."
-msgstr ""
-
-
-#  "Usuarios que no se les permitirá borrar actividades a través de la vista de "
-#  "lista."
-#: ../data/sugar.schemas.in.h:59
-msgid ""
-"Users will not be allowed to erase these activities through the list view."
-msgstr ""
-
-#  "Nivel de volumen"
-#: ../data/sugar.schemas.in.h:60
-msgid "Volume Level"
-msgstr ""
-
-#  "Nivel de volumen para el dispositivo de sonido."
-#: ../data/sugar.schemas.in.h:61
-msgid "Volume level for the sound device."
-msgstr ""
-
-
-#  "Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa "
-#  "que se retome la última entrada de esa actividad."
-#: ../data/sugar.schemas.in.h:62
-msgid ""
-"When in resume mode, clicking on a favorite icon will cause the last entry "
-"for that activity to be resumed."
-msgstr ""
-
-
-#  "sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: "
-#  "módulo %s: %r"
-#: ../src/jarabe/controlpanel/cmd.py:28
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-
-#  "sugar-control-panel: clave=%s no es una opción disponible"
-#: ../src/jarabe/controlpanel/cmd.py:30
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr ""
-
-#  "sugar-control-panel: %s"
-#: ../src/jarabe/controlpanel/cmd.py:31
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr ""
-
-
-#  "Uso: sugar-control-panel [ opción ] clave [ args ... ] \n"
-#  "    Control para el ambiente de sugar. \n"
-#  "    Opciones: \n"
-#  "    -h               muestra este mensaje de ayuda y sale \n"
-#  "    -l                enumera todas las opciones disponibles \n"
-#  "    -h clave       muestra la información sobre esta clave \n"
-#  "    -g clave       obtiene el valor actual de la clave \n"
-#  "    -s clave       establece el valor actual de la clave \n"
-#  "    -c clave  vaciar el valor actual de la clave \n"
-#  "    "
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:38
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
-msgstr ""
-
-#  "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
-#: ../src/jarabe/controlpanel/cmd.py:52
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr ""
-
-#  "Advertencia"
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
-#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
-#: ../src/jarabe/journal/volumestoolbar.py:307
-msgid "Warning"
-msgstr ""
-
-#  "Los cambios requieren reiniciar"
-#: ../src/jarabe/controlpanel/gui.py:297
-#: ../src/jarabe/controlpanel/sectionview.py:41
-msgid "Changes require restart"
-msgstr ""
-
-#  "Cancelar cambios"
-#: ../src/jarabe/controlpanel/gui.py:300
-msgid "Cancel changes"
-msgstr ""
-
-#  "Después"
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
-msgid "Later"
-msgstr ""
-
-#  "Reiniciar ahora"
-#: ../src/jarabe/controlpanel/gui.py:309
-msgid "Restart now"
-msgstr ""
-
-#  "Hecho"
-#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
-msgid "Done"
-msgstr ""
-
-#  "Aceptar"
-#: ../src/jarabe/controlpanel/toolbar.py:125
-#: ../src/jarabe/desktop/favoritesview.py:347
-msgid "Ok"
-msgstr ""
-
-#  "Versión %s"
-#: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format
-msgid "Version %s"
-msgstr ""
-
-#  "Confirmar borrado"
-#: ../src/jarabe/desktop/activitieslist.py:356
-msgid "Confirm erase"
-msgstr ""
-
-#  "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?"
-#: ../src/jarabe/desktop/activitieslist.py:358
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#  "Guardar"
-#: ../src/jarabe/desktop/activitieslist.py:362
-#: ../src/jarabe/frame/clipboardmenu.py:67
-#: ../src/jarabe/view/viewsource.py:280
-msgid "Keep"
-msgstr ""
-
-#  "Borrar"
-#: ../src/jarabe/desktop/activitieslist.py:365
-#: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
-#: ../src/jarabe/journal/palettes.py:126
-msgid "Erase"
-msgstr ""
-
-#  "Remover favorito"
-#: ../src/jarabe/desktop/activitieslist.py:435
-msgid "Remove favorite"
-msgstr ""
-
-#  "Hacer favorito"
-#: ../src/jarabe/desktop/activitieslist.py:439
-msgid "Make favorite"
-msgstr ""
-
-#  "Forma libre"
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:127
-msgid "Freeform"
-msgstr ""
-
-#  "Anillo"
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:215
-msgid "Ring"
-msgstr ""
-
-#  "Espiral"
-#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:402
-msgid "Spiral"
-msgstr ""
-
-#  "Caja"
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:472
-msgid "Box"
-msgstr ""
-
-#  "Triángulo"
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:515
-msgid "Triangle"
-msgstr ""
-
-#  "Error al registrar"
-#: ../src/jarabe/desktop/favoritesview.py:338
-msgid "Registration Failed"
-msgstr ""
-
-#  "%s"
-#: ../src/jarabe/desktop/favoritesview.py:339
-#, python-format
-msgid "%s"
-msgstr ""
-
-#  "Registro exitoso"
-#: ../src/jarabe/desktop/favoritesview.py:341
-msgid "Registration Successful"
-msgstr ""
-
-#  "Ahora estás registrado en el servidor de colegio."
-#: ../src/jarabe/desktop/favoritesview.py:342
-msgid "You are now registered with your school server."
-msgstr ""
-
-#  "Registro"
-#: ../src/jarabe/desktop/favoritesview.py:641
-msgid "Register"
-msgstr ""
-
-#  "Registrar nuevamente"
-#: ../src/jarabe/desktop/favoritesview.py:643
-#: ../src/jarabe/desktop/favoritesview.py:660
-msgid "Register again"
-msgstr ""
-
-#  "Actualización de Software"
-#: ../src/jarabe/desktop/homebox.py:66
-msgid "Software Update"
-msgstr ""
-
-
-#  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-
-#  "Pruebe ahora"
-#: ../src/jarabe/desktop/homebox.py:76
-msgid "Check now"
-msgstr ""
-
-#  "Vista en lista"
-#: ../src/jarabe/desktop/homebox.py:197
-msgid "List view"
-msgstr ""
-
-#  "<Ctrl>2"
-#: ../src/jarabe/desktop/homebox.py:198
-msgid "<Ctrl>2"
-msgstr ""
-
-#  "Vista de favoritos"
-#: ../src/jarabe/desktop/homebox.py:253
-msgid "Favorites view"
-msgstr ""
-
-#  "<Ctrl>1"
-#: ../src/jarabe/desktop/homebox.py:254
-msgid "<Ctrl>1"
-msgstr ""
-
-#  "Tipo de clave:"
-#: ../src/jarabe/desktop/keydialog.py:143
-msgid "Key Type:"
-msgstr ""
-
-#  "Tipo de autenticación:"
-#: ../src/jarabe/desktop/keydialog.py:163
-msgid "Authentication Type:"
-msgstr ""
-
-#  "WPA y WPA2 Personal"
-#: ../src/jarabe/desktop/keydialog.py:229
-msgid "WPA & WPA2 Personal"
-msgstr ""
-
-#  "Seguridad inalámbrica:"
-#: ../src/jarabe/desktop/keydialog.py:238
-msgid "Wireless Security:"
-msgstr ""
-
-#  "Retomar"
-#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
-#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
-msgid "Resume"
-msgstr ""
-
-#  "Unirse"
-#: ../src/jarabe/desktop/meshbox.py:96
-#: ../src/jarabe/frame/activitiestray.py:182
-msgid "Join"
-msgstr ""
-
-#  "Red específica %d"
-#: ../src/jarabe/desktop/networkviews.py:500
-#, python-format
-msgid "Ad-hoc Network %d"
-msgstr ""
-
-#  "Red Malla %d"
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format
-msgid "Mesh Network %d"
-msgstr ""
-
-#  "No se puede conectar al servidor."
-#: ../src/jarabe/desktop/schoolserver.py:143
-msgid "Cannot connect to the server."
-msgstr ""
-
-#  "El servidor no pudo completar el pedido."
-#: ../src/jarabe/desktop/schoolserver.py:150
-msgid "The server could not complete the request."
-msgstr ""
-
-#  "Rechazar"
-#: ../src/jarabe/frame/activitiestray.py:187
-#: ../src/jarabe/frame/activitiestray.py:574
-msgid "Decline"
-msgstr ""
-
-#  "%dB"
-#: ../src/jarabe/frame/activitiestray.py:523
-#, python-format
-msgid "%dB"
-msgstr ""
-
-#  "%dKB"
-#: ../src/jarabe/frame/activitiestray.py:525
-#, python-format
-msgid "%dKB"
-msgstr ""
-
-#  "%dMB"
-#: ../src/jarabe/frame/activitiestray.py:527
-#, python-format
-msgid "%dMB"
-msgstr ""
-
-#  "%s de %s"
-#: ../src/jarabe/frame/activitiestray.py:544
-#, python-format
-msgid "%s of %s"
-msgstr ""
-
-#  "Transferencia desde %s"
-#: ../src/jarabe/frame/activitiestray.py:558
-#, python-format
-msgid "Transfer from %s"
-msgstr ""
-
-#  "Aceptar"
-#: ../src/jarabe/frame/activitiestray.py:569
-msgid "Accept"
-msgstr ""
-
-#  "%s (%s)"
-#: ../src/jarabe/frame/activitiestray.py:592
-#: ../src/jarabe/frame/activitiestray.py:722
-#, python-format
-msgid "%s (%s)"
-msgstr ""
-
-#  "Descartar"
-#: ../src/jarabe/frame/activitiestray.py:626
-#: ../src/jarabe/frame/activitiestray.py:639
-#: ../src/jarabe/frame/activitiestray.py:757
-msgid "Dismiss"
-msgstr ""
-
-#  "El otro participante canceló la transferencia del archivo"
-#: ../src/jarabe/frame/activitiestray.py:643
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#  "Transferir a %s"
-#: ../src/jarabe/frame/activitiestray.py:691
-#, python-format
-msgid "Transfer to %s"
-msgstr ""
-
-#  "Eliminar"
-#: ../src/jarabe/frame/clipboardmenu.py:56
-msgid "Remove"
-msgstr ""
-
-#  "Abrir"
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/frame/clipboardmenu.py:85
-msgid "Open"
-msgstr ""
-
-#  "Abrir con"
-#: ../src/jarabe/frame/clipboardmenu.py:90
-msgid "Open with"
-msgstr ""
-
-#  "recorte de %s"
-#: ../src/jarabe/frame/clipboardobject.py:50
-#, python-format
-msgid "%s clipping"
-msgstr ""
-
-#  "Vecindario"
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "Neighborhood"
-msgstr ""
-
-#  "F1"
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "F1"
-msgstr ""
-
-#  "F2"
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "F2"
-msgstr ""
-
-#  "F3"
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "F3"
-msgstr ""
-
-#  "F4"
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "F4"
-msgstr ""
-
-#  "Nombre:"
-#: ../src/jarabe/intro/window.py:90
-msgid "Name:"
-msgstr ""
-
-#  "Clic para cambiar de color:"
-#: ../src/jarabe/intro/window.py:126
-msgid "Click to change color:"
-msgstr ""
-
-#  "Atrás"
-#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
-msgid "Back"
-msgstr ""
-
-#  "Siguiente"
-#: ../src/jarabe/intro/window.py:204
-msgid "Next"
-msgstr ""
-
-#  "Sin título"
-#: ../src/jarabe/journal/expandedentry.py:156
-#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
-#: ../src/jarabe/journal/volumestoolbar.py:130
-msgid "Untitled"
-msgstr ""
-
-#  "Sin vista previa"
-#: ../src/jarabe/journal/expandedentry.py:245
-msgid "No preview"
-msgstr ""
-
-#  "Tipo: %s"
-#: ../src/jarabe/journal/expandedentry.py:264
-#, python-format
-msgid "Kind: %s"
-msgstr ""
-
-#  "Desconocido"
-#: ../src/jarabe/journal/expandedentry.py:264
-#: ../src/jarabe/journal/listmodel.py:150
-#: ../src/jarabe/journal/listmodel.py:158
-msgid "Unknown"
-msgstr ""
-
-#  "Fecha: %s"
-#: ../src/jarabe/journal/expandedentry.py:265
-#, python-format
-msgid "Date: %s"
-msgstr ""
-
-#  "Tamaño: %s"
-#: ../src/jarabe/journal/expandedentry.py:266
-#, python-format
-msgid "Size: %s"
-msgstr ""
-
-#  "Sin fecha"
-#: ../src/jarabe/journal/expandedentry.py:294
-#: ../src/jarabe/journal/misc.py:108
-msgid "No date"
-msgstr ""
-
-#  "Participantes:"
-#: ../src/jarabe/journal/expandedentry.py:301
-msgid "Participants:"
-msgstr ""
-
-#  "Descripción:"
-#: ../src/jarabe/journal/expandedentry.py:323
-msgid "Description:"
-msgstr ""
-
-#  "Etiquetas:"
-#: ../src/jarabe/journal/expandedentry.py:348
-msgid "Tags:"
-msgstr ""
-
-#  "Diario"
-#: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
-#: ../src/jarabe/journal/palettes.py:198
-#: ../src/jarabe/journal/volumestoolbar.py:368
-msgid "Journal"
-msgstr ""
-
-#  "Buscar"
-#: ../src/jarabe/journal/journaltoolbox.py:71
-msgid "Search"
-msgstr ""
-
-#  "Cualquier momento"
-#: ../src/jarabe/journal/journaltoolbox.py:138
-msgid "Anytime"
-msgstr ""
-
-#  "Hoy"
-#: ../src/jarabe/journal/journaltoolbox.py:140
-msgid "Today"
-msgstr ""
-
-#  "Desde ayer"
-#: ../src/jarabe/journal/journaltoolbox.py:142
-msgid "Since yesterday"
-msgstr ""
-
-#  "Última semana"
-#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
-msgid "Past week"
-msgstr ""
-
-#  "Último mes"
-#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
-msgid "Past month"
-msgstr ""
-
-#  "Último año"
-#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
-msgid "Past year"
-msgstr ""
-
-#  "Cualquiera"
-#: ../src/jarabe/journal/journaltoolbox.py:155
-msgid "Anyone"
-msgstr ""
-
-#  "Mis amigos"
-#: ../src/jarabe/journal/journaltoolbox.py:157
-msgid "My friends"
-msgstr ""
-
-#  "Mi clase"
-#: ../src/jarabe/journal/journaltoolbox.py:158
-msgid "My class"
-msgstr ""
-
-#  "Cualquiera"
-#: ../src/jarabe/journal/journaltoolbox.py:300
-msgid "Anything"
-msgstr ""
-
-#  "Copiar a"
-#: ../src/jarabe/journal/journaltoolbox.py:381
-#: ../src/jarabe/journal/palettes.py:93
-msgid "Copy to"
-msgstr ""
-
-#  "Duplicar"
-#: ../src/jarabe/journal/journaltoolbox.py:389
-#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
-msgid "Duplicate"
-msgstr ""
-
-#  "Error mientras se copiaba la entrada. %s"
-#: ../src/jarabe/journal/journaltoolbox.py:422
-#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
-#: ../src/jarabe/journal/volumestoolbar.py:315
-#, python-format
-msgid "Error while copying the entry. %s"
-msgstr ""
-
-#  "Error"
-#: ../src/jarabe/journal/journaltoolbox.py:423
-#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
-#: ../src/jarabe/journal/volumestoolbar.py:316
-msgid "Error"
-msgstr ""
-
-#  "Iniciar"
-#. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
-#: ../src/jarabe/journal/palettes.py:74
-msgid "Start"
-msgstr ""
-
-#  "Ordenar por fecha de modificación"
-#: ../src/jarabe/journal/journaltoolbox.py:525
-msgid "Sort by date modified"
-msgstr ""
-
-#  "Ordenar por fecha de creación"
-#: ../src/jarabe/journal/journaltoolbox.py:526
-msgid "Sort by date created"
-msgstr ""
-
-#  "Ordenar por tamaño"
-#: ../src/jarabe/journal/journaltoolbox.py:527
-msgid "Sort by size"
-msgstr ""
-
-#  "Ordenar vista"
-#: ../src/jarabe/journal/journaltoolbox.py:536
-msgid "Sort view"
-msgstr ""
-
-#  "Su diario está vacío"
-#: ../src/jarabe/journal/listview.py:316
-msgid "Your Journal is empty"
-msgstr ""
-
-#  "Tu carpeta de documentos está vacía"
-#: ../src/jarabe/journal/listview.py:319
-msgid "Your documents folder is empty"
-msgstr ""
-
-#  "El dispositivo está vacío"
-#: ../src/jarabe/journal/listview.py:321
-msgid "The device is empty"
-msgstr ""
-
-#  "No hay entradas coincidentes"
-#: ../src/jarabe/journal/listview.py:323
-msgid "No matching entries"
-msgstr ""
-
-#  "Limpiar búsqueda"
-#: ../src/jarabe/journal/listview.py:397
-msgid "Clear search"
-msgstr ""
-
-#  "Versión más antigua de la actividad %s"
-#: ../src/jarabe/journal/misc.py:273
-#, python-format
-msgid "Older Version Of %s Activity"
-msgstr ""
-
-#  "¿Desea instalar la versión %s, mas antigua?    "
-#: ../src/jarabe/journal/misc.py:274
-#, python-format
-msgid "Do you want to downgrade to version %s"
-msgstr ""
-
-#  "Su diario está lleno"
-#: ../src/jarabe/journal/modalalert.py:64
-msgid "Your Journal is full"
-msgstr ""
-
-
-#  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
-#  "nuevas entradas."
-#: ../src/jarabe/journal/modalalert.py:68
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-
-#  "Mostrar diario"
-#: ../src/jarabe/journal/modalalert.py:80
-msgid "Show Journal"
-msgstr ""
-
-#  "Escoja un objeto"
-#: ../src/jarabe/journal/objectchooser.py:146
-msgid "Choose an object"
-msgstr ""
-
-#  "Cerrar"
-#: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:410
-msgid "Close"
-msgstr ""
-
-#  "Reiniciar con"
-#: ../src/jarabe/journal/palettes.py:72
-msgid "Resume with"
-msgstr ""
-
-#  "Empezar con"
-#: ../src/jarabe/journal/palettes.py:75
-msgid "Start with"
-msgstr ""
-
-#  "No se encontró una actividad para iniciar la entrada"
-#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
-msgid "No activity to start entry"
-msgstr ""
-
-#  "Enviar a"
-#: ../src/jarabe/journal/palettes.py:112
-msgid "Send to"
-msgstr ""
-
-#  "Ver detalles"
-#: ../src/jarabe/journal/palettes.py:121
-msgid "View Details"
-msgstr ""
-
-#  "Las entradas sin un archivo no pueden ser enviadas."
-#: ../src/jarabe/journal/palettes.py:160
-msgid "Entries without a file cannot be sent."
-msgstr ""
-
-#  "Entradas sin un archivo no pueden ser copiadas."
-#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
-#: ../src/jarabe/journal/volumestoolbar.py:306
-msgid "Entries without a file cannot be copied."
-msgstr ""
-
-#  "Portapapeles"
-#: ../src/jarabe/journal/palettes.py:267
-msgid "Clipboard"
-msgstr ""
-
-#  "No hay amigos presentes"
-#: ../src/jarabe/journal/palettes.py:322
-msgid "No friends present"
-msgstr ""
-
-#  "No se encontró una conexión válida"
-#: ../src/jarabe/journal/palettes.py:327
-msgid "No valid connection found"
-msgstr ""
-
-#  "No se encontró una actividad para retomar la entrada"
-#: ../src/jarabe/journal/palettes.py:355
-msgid "No activity to resume entry"
-msgstr ""
-
-#  "Documentos"
-#: ../src/jarabe/journal/volumestoolbar.py:209
-msgid "Documents"
-msgstr ""
-
-#  "%(free_space)d MB libres"
-#: ../src/jarabe/journal/volumestoolbar.py:391
-#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#  "La razón para el cambio de estado del dispositivo es desconocida."
-#: ../src/jarabe/model/network.py:163
-msgid "The reason for the device state change is unknown."
-msgstr ""
-
-#  "El cambio de estado es normal."
-#: ../src/jarabe/model/network.py:165
-msgid "The state change is normal."
-msgstr ""
-
-#  "El dispositivo está siendo administrado."
-#: ../src/jarabe/model/network.py:167
-msgid "The device is now managed."
-msgstr ""
-
-#  "El dispositivo ya no está siendo administrado."
-#: ../src/jarabe/model/network.py:169
-msgid "The device is no longer managed."
-msgstr ""
-
-#  "El dispositivo no pudo ser preparado para su configuración."
-#: ../src/jarabe/model/network.py:171
-msgid "The device could not be readied for configuration."
-msgstr ""
-
-
-#  "La configuración IP no pudo ser reservada (no hay dirección disponible, "
-#  "tiempo fuera, etc)."
-#: ../src/jarabe/model/network.py:173
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)."
-msgstr ""
-
-#  "La configuración IP ya no es válida."
-#: ../src/jarabe/model/network.py:176
-msgid "The IP configuration is no longer valid."
-msgstr ""
-
-#  "Claves requeridas, pero no fueron suministradas."
-#: ../src/jarabe/model/network.py:178
-msgid "Secrets were required, but not provided."
-msgstr ""
-
-
-#  "El cliente 802.1X fué desconectado del punto de acceso o del server de "
-#  "autenticación."
-#: ../src/jarabe/model/network.py:180
-msgid ""
-"The 802.1X supplicant disconnected from the access point or authentication "
-"server."
-msgstr ""
-
-#  "Configuración del cliente 802.1X fallada."
-#: ../src/jarabe/model/network.py:183
-msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
-
-#  "El cliente 802.1X ha abandonado o fallado inesperadamente."
-#: ../src/jarabe/model/network.py:185
-msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
-
-#  "El cliente 802.1X ha tomado demasiado tiempo para autenticar."
-#: ../src/jarabe/model/network.py:187
-msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
-
-#  "El servicio PPP ha fallado en comenzar en el tiempo permitido."
-#: ../src/jarabe/model/network.py:189
-msgid "The PPP service failed to start within the allowed time."
-msgstr ""
-
-#  "El servicio PPP se ha desconectado inesperadamente."
-#: ../src/jarabe/model/network.py:191
-msgid "The PPP service disconnected unexpectedly."
-msgstr ""
-
-#  "El servicio PPP ha abandonado o fallado inesperadamente."
-#: ../src/jarabe/model/network.py:193
-msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
-
-#  "El servicio DHCP ha fallado en comenzar en el tiempo permitido."
-#: ../src/jarabe/model/network.py:195
-msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
-
-#  "El servicio DHCP ha reportado un error inesperado."
-#: ../src/jarabe/model/network.py:197
-msgid "The DHCP service reported an unexpected error."
-msgstr ""
-
-#  "El servicio DHCP ha abandonado o fallado inesperadamente."
-#: ../src/jarabe/model/network.py:199
-msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
-
-#  "El servicio de conexión compartida ha fallado al iniciar."
-#: ../src/jarabe/model/network.py:201
-msgid "The shared connection service failed to start."
-msgstr ""
-
-
-#  "El servicio de conexión compartida ha abandonado o fallado inesperadamente."
-#: ../src/jarabe/model/network.py:203
-msgid "The shared connection service quit or failed unexpectedly."
-msgstr ""
-
-#  "El servicio AutoIP ha fallado al iniciar."
-#: ../src/jarabe/model/network.py:206
-msgid "The AutoIP service failed to start."
-msgstr ""
-
-#  "El servicio AutoIP ha reportado un error inesperado."
-#: ../src/jarabe/model/network.py:208
-msgid "The AutoIP service reported an unexpected error."
-msgstr ""
-
-#  "El servicio AutoIP ha abandonado o fallado inesperadamente."
-#: ../src/jarabe/model/network.py:210
-msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
-
-#  "Conexión fallada porque la línea estaba ocupada."
-#: ../src/jarabe/model/network.py:212
-msgid "Dialing failed because the line was busy."
-msgstr ""
-
-#  "Conexión fallada porque no había tono de llamada."
-#: ../src/jarabe/model/network.py:214
-msgid "Dialing failed because there was no dial tone."
-msgstr ""
-
-#  "Conexión fallada porque no había portadora."
-#: ../src/jarabe/model/network.py:216
-msgid "Dialing failed because there was no carrier."
-msgstr ""
-
-#  "Llamada expiró por tiempo."
-#: ../src/jarabe/model/network.py:218
-msgid "Dialing timed out."
-msgstr ""
-
-#  "Llamada falló."
-#: ../src/jarabe/model/network.py:220
-msgid "Dialing failed."
-msgstr ""
-
-#  "Fallo en inicialización de modem."
-#: ../src/jarabe/model/network.py:222
-msgid "Modem initialization failed."
-msgstr ""
-
-#  "Fallo al seleccionar el punto de acceso (APN) GSM"
-#: ../src/jarabe/model/network.py:224
-msgid "Failed to select the specified GSM APN"
-msgstr ""
-
-#  "No se buscan redes."
-#: ../src/jarabe/model/network.py:226
-msgid "Not searching for networks."
-msgstr ""
-
-#  "Registración en la red fué rechazada."
-#: ../src/jarabe/model/network.py:228
-msgid "Network registration was denied."
-msgstr ""
-
-#  "Registración en la red expiró."
-#: ../src/jarabe/model/network.py:230
-msgid "Network registration timed out."
-msgstr ""
-
-#  "Falló la registración con la red GSM solicitada."
-#: ../src/jarabe/model/network.py:232
-msgid "Failed to register with the requested GSM network."
-msgstr ""
-
-#  "Control de PIN fallado."
-#: ../src/jarabe/model/network.py:234
-msgid "PIN check failed."
-msgstr ""
-
-#  "Firmware necesario para el dispositivo puede faltar."
-#: ../src/jarabe/model/network.py:236
-msgid "Necessary firmware for the device may be missing."
-msgstr ""
-
-#  "El dispositivo fué quitado."
-#: ../src/jarabe/model/network.py:238
-msgid "The device was removed."
-msgstr ""
-
-#  "NetworkManager fue dormido."
-#: ../src/jarabe/model/network.py:240
-msgid "NetworkManager went to sleep."
-msgstr ""
-
-
-#  "Las conexiones activas del dispositivo fueron removidas o desaparecieron."
-#: ../src/jarabe/model/network.py:242
-msgid "The device's active connection was removed or disappeared."
-msgstr ""
-
-#  "Un usuario o cliente solicitó la desconexión."
-#: ../src/jarabe/model/network.py:245
-msgid "A user or client requested the disconnection."
-msgstr ""
-
-#  "La portadora/link del dispositivo a cambiado."
-#: ../src/jarabe/model/network.py:247
-msgid "The device's carrier/link changed."
-msgstr ""
-
-#  "Remover amigo"
-#: ../src/jarabe/view/buddymenu.py:67
-msgid "Remove friend"
-msgstr ""
-
-#  "Agregar amigo"
-#: ../src/jarabe/view/buddymenu.py:70
-msgid "Make friend"
-msgstr ""
-
-#  "Apagar"
-#: ../src/jarabe/view/buddymenu.py:87
-msgid "Shutdown"
-msgstr ""
-
-#  "Reiniciar"
-#: ../src/jarabe/view/buddymenu.py:95
-msgid "Restart"
-msgstr ""
-
-#  "Salir"
-#: ../src/jarabe/view/buddymenu.py:101
-msgid "Logout"
-msgstr ""
-
-#  "Mis ajustes"
-#: ../src/jarabe/view/buddymenu.py:106
-msgid "My Settings"
-msgstr ""
-
-#  "Invitar a %s"
-#: ../src/jarabe/view/buddymenu.py:142
-#, python-format
-msgid "Invite to %s"
-msgstr ""
-
-#  "<b>%s</b> falló al iniciar."
-#: ../src/jarabe/view/launcher.py:145
-#, python-format
-msgid "<b>%s</b> failed to start."
-msgstr ""
-
-#  "Iniciando..."
-#: ../src/jarabe/view/palettes.py:48
-msgid "Starting..."
-msgstr ""
-
-#  "Actividad falló al iniciar"
-#: ../src/jarabe/view/palettes.py:58
-msgid "Activity failed to start"
-msgstr ""
-
-#  "Ver fuente"
-#. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:91
-msgid "View Source"
-msgstr ""
-
-#  "Parar"
-#: ../src/jarabe/view/palettes.py:102
-msgid "Stop"
-msgstr ""
-
-#  "Empezar nuevo"
-#: ../src/jarabe/view/palettes.py:139
-msgid "Start new"
-msgstr ""
-
-#  "Mostrar contenidos"
-#: ../src/jarabe/view/palettes.py:180
-msgid "Show contents"
-msgstr ""
-
-#  "Eliminar"
-#: ../src/jarabe/view/palettes.py:229
-msgid "Remove"
-msgstr ""
-
-#  "Fuente de la instancia"
-#: ../src/jarabe/view/viewsource.py:263
-msgid "Instance Source"
-msgstr ""
-
-#  "Fuente"
-#: ../src/jarabe/view/viewsource.py:312
-msgid "Source"
-msgstr ""
-
-#  "Fuente del paquete de la actividad"
-#: ../src/jarabe/view/viewsource.py:374
-msgid "Activity Bundle Source"
-msgstr ""
-
-#  "Fuente del paquete SugarToolkit"
-#: ../src/jarabe/view/viewsource.py:393
-msgid "Sugar Toolkit Source"
-msgstr ""
-
-#  "Ver código fuente: %r"
-#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
-#, python-format
-msgid "View source: %r"
-msgstr ""
-
-#  "Sugar en una ventana"
-#: ../src/jarabe/util/emulator.py:40
-msgid "Sugar in a window"
-msgstr ""
-
diff --git a/po/qu.po b/po/qu.po
deleted file mode 100644
index b0faf7d..0000000
--- a/po/qu.po
+++ /dev/null
@@ -1,1713 +0,0 @@
-# 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.0.1\n"
-
-#: ../extensions/cpsection/aboutme/__init__.py:24
-msgid "About Me"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:48
-msgid "You must enter a name."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:75
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:78
-#, python-format
-msgid "stroke:   %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:80
-#, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:82
-#, python-format
-msgid "fill:     %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:94
-msgid "Error in specified color modifiers."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:97
-msgid "Error in specified colors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:235
-msgid "Click to change your color:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/__init__.py:21
-msgid "About my Computer"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:42
-msgid "Not available"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:171
-#, python-format
-msgid "%(interface)s: %(version)s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:61
-msgid "Identity"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:70
-msgid "Serial Number:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:92
-msgid "Software"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:101
-msgid "Build:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:116
-msgid "Sugar:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:132
-msgid "Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:147
-msgid "Wireless Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:170
-msgid "Copyright and License"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:188
-msgid ""
-"Sugar is the graphical user interface that you are looking at. Sugar is free "
-"software, covered by the GNU General Public License, and you are welcome to "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:200
-msgid "Full license:"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/model.py:92
-msgid "Error timezone does not exist."
-msgstr ""
-
-#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
-msgid "Timezone"
-msgstr ""
-
-#: ../extensions/cpsection/frame/__init__.py:21
-msgid "Frame"
-msgstr ""
-
-#: ../extensions/cpsection/frame/model.py:41
-#: ../extensions/cpsection/frame/model.py:66
-msgid "Value must be an integer."
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:27
-msgid "never"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:28
-msgid "instantaneous"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:29
-#, python-format
-msgid "%s seconds"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:54
-msgid "Activation Delay"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:78
-msgid "Corner"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:113
-msgid "Edge"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:32
-msgid "Keyboard"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:190
-msgid "Keyboard Model"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:250
-msgid "Key(s) to change layout"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:319
-msgid "Keyboard Layout(s)"
-msgstr ""
-
-#: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:33
-msgid "Language"
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:30
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:129
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:152
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr ""
-
-#: ../extensions/cpsection/language/view.py:57
-msgid ""
-"Add languages in the order you prefer. If a translation is not available, "
-"the next in the list will be used."
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/__init__.py:21
-msgid "Modem Configuration"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:94
-msgid "Username:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:106
-msgid "Password:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:118
-msgid "Number:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:130
-msgid "Access Point Name (APN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:142
-msgid "Personal Identity Number (PIN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:154
-msgid "Personal Unblocking Key (PUK):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:175
-msgid ""
-"You will need to provide the following information to set up a mobile "
-"broadband connection to a cellular (3G) network."
-msgstr ""
-
-#: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:29
-msgid "Network"
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:71
-msgid "State is unknown."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:99
-msgid "Error in specified radio argument use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:140
-msgid "Error in specified argument use 0/1."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:61
-msgid "Wireless"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:69
-msgid "Turn off the wireless radio to save battery life"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:82
-msgid "Radio"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:98
-msgid "Discard network history if you have trouble connecting to the network"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:107
-msgid "Discard network history"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:122
-msgid "Collaboration"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:130
-msgid ""
-"The server is the equivalent of what room you are in; people on the same "
-"server will be able to see each other, even when they aren't on the same "
-"network."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:140
-msgid "Server:"
-msgstr ""
-
-#: ../extensions/cpsection/power/__init__.py:21
-msgid "Power"
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:90
-msgid "Error in automatic pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:120
-msgid "Error in extreme pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:48
-msgid "Power management"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:58
-msgid "Automatic power management (increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:86
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/updater/__init__.py:21
-msgid "Software update"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:63
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities, and "
-"provide new features."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:125
-#, python-format
-msgid "Checking %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:127
-#, python-format
-msgid "Downloading %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:129
-#, python-format
-msgid "Updating %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:139
-msgid "Your software is up-to-date"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:141
-#, python-format
-msgid "You can install %s update"
-msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:159
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:164
-msgid "Installing updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:173
-#, python-format
-msgid "%s update was installed"
-msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:255
-msgid "Install selected"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:276
-#, python-format
-msgid "Download size: %s"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:364
-#, python-format
-msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
-
-#. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:382
-msgid "None"
-msgstr ""
-
-#. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:385
-msgid "1 KB"
-msgstr ""
-
-#. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:388
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:391
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:71
-msgid "My Battery"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:147
-msgid "Removed"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:150
-msgid "Charging"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:153
-msgid "Very little power remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:158
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:161
-msgid "Charged"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:49
-#, python-format
-msgid "IP address: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:104
-#: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
-msgid "Disconnect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:112
-#: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
-msgid "Connecting..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:117
-#: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
-msgid "Connected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:130
-msgid "No wireless connection"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:144
-msgid "Channel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:159
-msgid "Wired Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:188
-msgid "Speed"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:213
-msgid "Wireless modem"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:281
-msgid "Please wait..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
-msgid "Connect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:287
-msgid "Disconnected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:294
-#: ../src/jarabe/controlpanel/toolbar.py:119
-#: ../src/jarabe/desktop/homebox.py:71
-#: ../src/jarabe/frame/activitiestray.py:602
-#: ../src/jarabe/frame/activitiestray.py:704
-#: ../src/jarabe/frame/activitiestray.py:732
-msgid "Cancel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:333
-msgid "Try connection again"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:336
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:340
-#, python-format
-msgid "Suggestion: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:349
-#, python-format
-msgid "Connected for %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:355
-#: ../extensions/deviceicon/network.py:356
-#, python-format
-msgid "%d KB"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:361
-msgid "Check your Pin/Puk configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:364
-msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:368
-msgid "Check the Number configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:370
-msgid "Check your configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:612
-msgid "Mesh Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:656
-#, python-format
-msgid "Mesh Network %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:779
-msgid "No GSM connection available."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:780
-msgid "Create a connection in the control panel."
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:61
-msgid "My Speakers"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:138
-msgid "Unmute"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:141
-msgid "Mute"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:38
-msgid "finger"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:39
-msgid "stylus"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:68
-msgid "My touchpad"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:59
-msgid "Mesh"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "Group"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "Home"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "Activity"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:72
-msgid "Screenshot"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:74
-#, python-format
-msgid "Screenshot of \"%s\""
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:1
-msgid ""
-"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
-"long name."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:2
-msgid "Additional directories which can contain updated translations."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:3
-msgid "Backup URL"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:4
-msgid "Bundle IDs of protected activities"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:5
-msgid ""
-"Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rgb colors. "
-"Example: #AC32FF,#9A5200"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:6
-msgid "Corner Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:7
-msgid "Default font face"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:8
-msgid "Default font size"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:9
-msgid "Default nick"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:10
-msgid "Delay for the activation of the frame using the corners."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:11
-msgid "Delay for the activation of the frame using the edges."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:12
-msgid "Directory to search for translations"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:13
-msgid "Edge Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:14
-msgid "Favorites Layout"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:15
-msgid "Favorites resume mode"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:16
-msgid "Font face that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:17
-msgid "Font size that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:18
-msgid "GSM network APN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:19
-msgid "GSM network PIN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:20
-msgid "GSM network PUK"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:21
-msgid "GSM network access point name configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:22
-msgid "GSM network number"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:23
-msgid "GSM network password"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:24
-msgid "GSM network password configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:25
-msgid "GSM network personal identification number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:26
-msgid "GSM network personal unlock key configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:27
-msgid "GSM network telephone number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:28
-msgid "GSM network username"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:29
-msgid "GSM network username configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:30
-msgid ""
-"If TRUE, Sugar will make us searchable for the other users of the Jabber "
-"server."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:31
-msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:32
-msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:33
-msgid ""
-"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
-"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
-"hoc network."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:34
-msgid "Jabber Server"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:35
-msgid "Keyboard layouts"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:36
-msgid "Keyboard model"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:37
-msgid "Keyboard options"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:38
-msgid "Layout of the favorites view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:39
-msgid ""
-"List of keyboard layouts. Each entry should be in the form layout(variant)"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:40
-msgid "List of keyboard options."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:41
-msgid "Power Automatic"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:42
-msgid "Power Automatic."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:43
-msgid "Power Extreme"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:44
-msgid "Power Extreme."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:45
-msgid "Publish to Gadget"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:46
-msgid "Setting for muting the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:47
-msgid "Show Log out"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:48
-msgid "Show Restart"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:49
-msgid "Show Sugar Ad-hoc networks"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:50
-msgid "Sound Muted"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:51
-msgid "The keyboard model to be used"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:53
-msgid "Timezone setting for the system."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:54
-msgid "Url of the jabber server to use."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:55
-msgid "Url where the backup is saved to."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:56
-msgid "User Color"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:57
-msgid "User Name"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:58
-msgid "User name that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:59
-msgid ""
-"Users will not be allowed to erase these activities through the list view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:60
-msgid "Volume Level"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:61
-msgid "Volume level for the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:62
-msgid ""
-"When in resume mode, clicking on a favorite icon will cause the last entry "
-"for that activity to be resumed."
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:28
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:30
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:31
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr ""
-
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:38
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:52
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
-#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
-#: ../src/jarabe/journal/volumestoolbar.py:307
-msgid "Warning"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:297
-#: ../src/jarabe/controlpanel/sectionview.py:41
-msgid "Changes require restart"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:300
-msgid "Cancel changes"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
-msgid "Later"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:309
-msgid "Restart now"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
-msgid "Done"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:125
-#: ../src/jarabe/desktop/favoritesview.py:347
-msgid "Ok"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format
-msgid "Version %s"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:356
-msgid "Confirm erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:358
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:362
-#: ../src/jarabe/frame/clipboardmenu.py:67
-#: ../src/jarabe/view/viewsource.py:280
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:365
-#: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
-#: ../src/jarabe/journal/palettes.py:126
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:435
-msgid "Remove favorite"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:439
-msgid "Make favorite"
-msgstr ""
-
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:127
-msgid "Freeform"
-msgstr ""
-
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:215
-msgid "Ring"
-msgstr ""
-
-#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:402
-msgid "Spiral"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:472
-msgid "Box"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:515
-msgid "Triangle"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:338
-msgid "Registration Failed"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:339
-#, python-format
-msgid "%s"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:341
-msgid "Registration Successful"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:342
-msgid "You are now registered with your school server."
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:641
-msgid "Register"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:643
-#: ../src/jarabe/desktop/favoritesview.py:660
-msgid "Register again"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:66
-msgid "Software Update"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-msgid "Check now"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:197
-msgid "List view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:198
-msgid "<Ctrl>2"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:253
-msgid "Favorites view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:254
-msgid "<Ctrl>1"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:143
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:163
-msgid "Authentication Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:229
-msgid "WPA & WPA2 Personal"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:238
-msgid "Wireless Security:"
-msgstr ""
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
-#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
-msgid "Resume"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:96
-#: ../src/jarabe/frame/activitiestray.py:182
-msgid "Join"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:500
-#, python-format
-msgid "Ad-hoc Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format
-msgid "Mesh Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:143
-msgid "Cannot connect to the server."
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:150
-msgid "The server could not complete the request."
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:187
-#: ../src/jarabe/frame/activitiestray.py:574
-msgid "Decline"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:523
-#, python-format
-msgid "%dB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:525
-#, python-format
-msgid "%dKB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:527
-#, python-format
-msgid "%dMB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:544
-#, python-format
-msgid "%s of %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:558
-#, python-format
-msgid "Transfer from %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:569
-msgid "Accept"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:592
-#: ../src/jarabe/frame/activitiestray.py:722
-#, python-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:626
-#: ../src/jarabe/frame/activitiestray.py:639
-#: ../src/jarabe/frame/activitiestray.py:757
-msgid "Dismiss"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:643
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:691
-#, python-format
-msgid "Transfer to %s"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:56
-msgctxt "Clipboard"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/frame/clipboardmenu.py:85
-msgid "Open"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:90
-msgid "Open with"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardobject.py:50
-#, python-format
-msgid "%s clipping"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "Neighborhood"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "F1"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "F2"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "F3"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "F4"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:90
-msgid "Name:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:126
-msgid "Click to change color:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
-msgid "Back"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:204
-msgid "Next"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:156
-#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
-#: ../src/jarabe/journal/volumestoolbar.py:130
-msgid "Untitled"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:245
-msgid "No preview"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#, python-format
-msgid "Kind: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#: ../src/jarabe/journal/listmodel.py:150
-#: ../src/jarabe/journal/listmodel.py:158
-msgid "Unknown"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:265
-#, python-format
-msgid "Date: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:266
-#, python-format
-msgid "Size: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:294
-#: ../src/jarabe/journal/misc.py:108
-msgid "No date"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:301
-msgid "Participants:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:323
-msgid "Description:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:348
-msgid "Tags:"
-msgstr ""
-
-#: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
-#: ../src/jarabe/journal/palettes.py:198
-#: ../src/jarabe/journal/volumestoolbar.py:368
-msgid "Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:71
-msgid "Search"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:138
-msgid "Anytime"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:140
-msgid "Today"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:142
-msgid "Since yesterday"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
-msgid "Past week"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
-msgid "Past month"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
-msgid "Past year"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:155
-msgid "Anyone"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:157
-msgid "My friends"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:158
-msgid "My class"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:300
-msgid "Anything"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:381
-#: ../src/jarabe/journal/palettes.py:93
-msgid "Copy to"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:389
-#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:422
-#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
-#: ../src/jarabe/journal/volumestoolbar.py:315
-#, python-format
-msgid "Error while copying the entry. %s"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:423
-#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
-#: ../src/jarabe/journal/volumestoolbar.py:316
-msgid "Error"
-msgstr ""
-
-#. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
-#: ../src/jarabe/journal/palettes.py:74
-msgid "Start"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:525
-msgid "Sort by date modified"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:526
-msgid "Sort by date created"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:527
-msgid "Sort by size"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:536
-msgid "Sort view"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:316
-msgid "Your Journal is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:319
-msgid "Your documents folder is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:321
-msgid "The device is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:323
-msgid "No matching entries"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:397
-msgid "Clear search"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:273
-#, python-format
-msgid "Older Version Of %s Activity"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:274
-#, python-format
-msgid "Do you want to downgrade to version %s"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:64
-msgid "Your Journal is full"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:68
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:80
-msgid "Show Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:146
-msgid "Choose an object"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:410
-msgid "Close"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:72
-msgid "Resume with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:75
-msgid "Start with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
-msgid "No activity to start entry"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:112
-msgid "Send to"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:121
-msgid "View Details"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:160
-msgid "Entries without a file cannot be sent."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
-#: ../src/jarabe/journal/volumestoolbar.py:306
-msgid "Entries without a file cannot be copied."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:267
-msgid "Clipboard"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:322
-msgid "No friends present"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:327
-msgid "No valid connection found"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:355
-msgid "No activity to resume entry"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:209
-msgid "Documents"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:391
-#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:163
-msgid "The reason for the device state change is unknown."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:165
-msgid "The state change is normal."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:167
-msgid "The device is now managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:169
-msgid "The device is no longer managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:171
-msgid "The device could not be readied for configuration."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:173
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:176
-msgid "The IP configuration is no longer valid."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:178
-msgid "Secrets were required, but not provided."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:180
-msgid ""
-"The 802.1X supplicant disconnected from the access point or authentication "
-"server."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:183
-msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:185
-msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:187
-msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:189
-msgid "The PPP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:191
-msgid "The PPP service disconnected unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:193
-msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:195
-msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:197
-msgid "The DHCP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:199
-msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:201
-msgid "The shared connection service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:203
-msgid "The shared connection service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:206
-msgid "The AutoIP service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:208
-msgid "The AutoIP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:210
-msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:212
-msgid "Dialing failed because the line was busy."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:214
-msgid "Dialing failed because there was no dial tone."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:216
-msgid "Dialing failed because there was no carrier."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:218
-msgid "Dialing timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:220
-msgid "Dialing failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:222
-msgid "Modem initialization failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:224
-msgid "Failed to select the specified GSM APN"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:226
-msgid "Not searching for networks."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:228
-msgid "Network registration was denied."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:230
-msgid "Network registration timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:232
-msgid "Failed to register with the requested GSM network."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:234
-msgid "PIN check failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:236
-msgid "Necessary firmware for the device may be missing."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:238
-msgid "The device was removed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:240
-msgid "NetworkManager went to sleep."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:242
-msgid "The device's active connection was removed or disappeared."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:245
-msgid "A user or client requested the disconnection."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:247
-msgid "The device's carrier/link changed."
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:67
-msgid "Remove friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:70
-msgid "Make friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:87
-msgid "Shutdown"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:95
-msgid "Restart"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:101
-msgid "Logout"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:106
-msgid "My Settings"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:142
-#, python-format
-msgid "Invite to %s"
-msgstr ""
-
-#: ../src/jarabe/view/launcher.py:145
-#, python-format
-msgid "<b>%s</b> failed to start."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:48
-msgid "Starting..."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:58
-msgid "Activity failed to start"
-msgstr ""
-
-#. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:91
-msgid "View Source"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:102
-msgid "Stop"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:139
-msgid "Start new"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:180
-msgid "Show contents"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:229
-msgctxt "Volume"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:263
-msgid "Instance Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:312
-msgid "Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:374
-msgid "Activity Bundle Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:393
-msgid "Sugar Toolkit Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
-#, python-format
-msgid "View source: %r"
-msgstr ""
-
-#: ../src/jarabe/util/emulator.py:40
-msgid "Sugar in a window"
-msgstr ""
diff --git a/po/quy.po b/po/quy.po
index b42ad7e..4e67876 100644
--- a/po/quy.po
+++ b/po/quy.po
@@ -1,8 +1,12 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-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"
@@ -11,117 +15,92 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.7.0\n"
 
-#  "Acerca de mí"
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
 msgstr ""
 
-#  "Debe ingresar un nombre."
 #: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr ""
 
-#  "borde:   color=%s tonalidad=%s"
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr ""
 
-#  "borde:   %s"
 #: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr ""
 
-#  "relleno:     color=%s tonalidad=%s"
 #: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr ""
 
-#  "relleno:     %s"
 #: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr ""
 
-#  "Error en modificadores de color especificados."
 #: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr ""
 
-#  "Error en colores especificados."
 #: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr ""
 
-#  "Clic para cambiar su color:"
 #: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr ""
 
-#  "Acerca de mi computadora"
 #: ../extensions/cpsection/aboutcomputer/__init__.py:21
 msgid "About my Computer"
 msgstr ""
 
-#  "No disponible"
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr ""
 
-#  "%(interface)s: %(version)s"
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#  "Identidad"
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#  "Número de serie:"
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#  "Software"
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#  "Ensamble:"
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#  "Azúcar:"
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#  "Firmware:"
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#  "Firmware de la red inalámbrica:"
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#  "Licencia y derechos de autor"
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-
-#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
-#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
-#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
-#  "se describen en ella."
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -129,220 +108,173 @@ msgid ""
 "therein."
 msgstr ""
 
-#  "Licencia completa:"
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
-#  "Fecha y hora"
 #: ../extensions/cpsection/datetime/__init__.py:21
 msgid "Date & Time"
 msgstr ""
 
-#  "Error, zona horaria no existe."
 #: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr ""
 
-#  "Zona horaria"
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr ""
 
-#  "Cuadro"
 #: ../extensions/cpsection/frame/__init__.py:21
 msgid "Frame"
 msgstr ""
 
-#  "El valor debe ser un número entero."
 #: ../extensions/cpsection/frame/model.py:41
 #: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr ""
 
-#  "nunca"
 #: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr ""
 
-#  "instantáneo"
 #: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr ""
 
-#  "%s segundos"
 #: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr ""
 
-#  "Retraso de activación"
 #: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr ""
 
-#  "Esquina"
 #: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr ""
 
-#  "Borde"
 #: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr ""
 
-#  "Teclado"
 #: ../extensions/cpsection/keyboard/__init__.py:21
 #: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr ""
 
-#  "Modelo de teclado"
 #: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr ""
 
-#  "Tecla(s) para cambiar el diseño"
 #: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr ""
 
-#  "Diseño(s) de teclado"
 #: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr ""
 
-#  "Idioma"
 #: ../extensions/cpsection/language/__init__.py:21
 #: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr ""
 
-
-#  "No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr ""
 
-#  "El lenguaje del código=%s no pudo ser determinado."
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr ""
 
-#  "Lo siento, yo no hablo '%s'."
 #: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr ""
 
-
-#  "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
-#  "disponible, se usará la siguiente en la lista."
 #: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
 msgstr ""
 
-#  "Configuración del módem"
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
 msgid "Modem Configuration"
 msgstr ""
 
-#  "Nombre de usuario:"
 #: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
 msgstr ""
 
-#  "Contraseña:"
 #: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
 msgstr ""
 
-#  "Número:"
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
 msgstr ""
 
-#  "Nombre de punto de acceso (APN):"
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
 msgstr ""
 
-#  "Número de identificación personal (PIN):"
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#  "Clave personal de desbloqueo (PUK):"
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-
-#  "Necesitará proveer la información siguiente para configurar una conexión de "
-#  "banda ancha (3G) de red de telefonía celular."
 #: ../extensions/cpsection/modemconfiguration/view.py:175
 msgid ""
 "You will need to provide the following information to set up a mobile "
 "broadband connection to a cellular (3G) network."
 msgstr ""
 
-#  "Red"
 #: ../extensions/cpsection/network/__init__.py:21
 #: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr ""
 
-#  "Estado desconocido."
 #: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr ""
 
-#  "Error en argumento especificado de radio use on/off."
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#  "Error en argumento especificado use 0/1."
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
 
-#  "Inalámbrica"
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr ""
 
-#  "Apague la radio inalámbrica y ahorre vida de batería"
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
 
-#  "Radio"
 #: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr ""
 
-#  "Descarte el historial de la red si tiene problemas de conexión"
 #: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 
-#  "Descarte historial de la red"
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr ""
 
-#  "Colaboración"
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr ""
 
-
-#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
-#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
 #: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
@@ -350,83 +282,64 @@ msgid ""
 "network."
 msgstr ""
 
-#  "Servidor:"
 #: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr ""
 
-#  "Energía"
 #: ../extensions/cpsection/power/__init__.py:21
 msgid "Power"
 msgstr ""
 
-#  "Error en argumento automático de manejo de energía, use on/off."
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#  "Error en argumento extremo de manejo de energía, use on/off."
 #: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
 
-#  "Manejo de energía"
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr ""
 
-#  "Manejo automático de energía (incrementa la vida de la batería)"
 #: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-
-#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
-#  "duración de la batería)"
 #: ../extensions/cpsection/power/view.py:86
 msgid ""
 "Extreme power management (disables wireless radio, increases battery life)"
 msgstr ""
 
-#  "Actualización de software"
 #: ../extensions/cpsection/updater/__init__.py:21
 msgid "Software update"
 msgstr ""
 
-
-#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
-#  "de seguridad y proveen nuevas características."
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
 
-#  "Probando %s..."
 #: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr ""
 
-#  "Descargando %s..."
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr ""
 
-#  "Actualizando %s..."
 #: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
 msgstr ""
 
-#  "Tu software esta actualizado"
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr ""
 
-#  "Puedes instalar %s actualización"
-#  "Puedes instalar %s actualizaciones"
 #: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
@@ -434,18 +347,14 @@ msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#  "Buscando actualizaciones..."
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr ""
 
-#  "Instalando actualizaciones..."
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr ""
 
-#  "%s actualización fue instalada"
-#  "%s actualizaciones fueron instaladas"
 #: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
@@ -453,156 +362,130 @@ msgid_plural "%s updates were installed"
 msgstr[0] ""
 msgstr[1] ""
 
-#  "Instalación seleccionada"
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr ""
 
-#  "Tamaño de descarga: %s"
 #: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#  "Desde la version %(current)s hacia %(new)s (Size: %(size)s)"
 #: ../extensions/cpsection/updater/view.py:364
 #, python-format
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr ""
 
-#  "Ninguno"
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
 msgid "None"
 msgstr ""
 
-#  "1 KB"
 #. TRANS: download size of very small updates
 #: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
 msgstr ""
 
-#  "%.0f KB"
 #. TRANS: download size of small updates, e.g. '250 KB'
 #: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
 msgstr ""
 
-#  "%.1f MB"
 #. TRANS: download size of updates, e.g. '2.3 MB'
 #: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
 msgstr ""
 
-#  "Mi batería"
 #: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr ""
 
-#  "Eliminado"
 #: ../extensions/deviceicon/battery.py:147
 msgid "Removed"
 msgstr ""
 
-#  "Cargando"
 #: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
 msgstr ""
 
-#  "Queda muy poca batería"
 #: ../extensions/deviceicon/battery.py:153
 msgid "Very little power remaining"
 msgstr ""
 
-#  "Quedan %(hour)d:%(min).2d"
 #: ../extensions/deviceicon/battery.py:158
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr ""
 
-#  "Cargada"
 #: ../extensions/deviceicon/battery.py:161
 msgid "Charged"
 msgstr ""
 
-#  "Direccion IP: %s"
 #: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr ""
 
-#  "Desconectar"
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr ""
 
-#  "Conectando..."
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr ""
 
-#  "Conectado"
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
-#  "No hay conexión inalámbrica"
 #: ../extensions/deviceicon/network.py:130
 msgid "No wireless connection"
 msgstr ""
 
-#  "Canal"
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
 
-#  "Red Cableada"
 #: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
 msgstr ""
 
-#  "Velocidad"
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
 
-#  "Módem inalámbrico"
 #: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
 msgstr ""
 
-#  "Espere por favor..."
 #: ../extensions/deviceicon/network.py:281
 msgid "Please wait..."
 msgstr ""
 
-#  "Conectar"
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
-#  "Desconectado"
 #: ../extensions/deviceicon/network.py:287
 msgid "Disconnected"
 msgstr ""
 
-#  "Cancelar"
 #: ../extensions/deviceicon/network.py:294
 #: ../src/jarabe/controlpanel/toolbar.py:119
 #: ../src/jarabe/desktop/homebox.py:71
@@ -612,169 +495,134 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#  "Probar la conexión nuevamente"
 #: ../extensions/deviceicon/network.py:333
 msgid "Try connection again"
 msgstr ""
 
-#  "Error: %s"
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#  "Sugerencia: %s"
 #: ../extensions/deviceicon/network.py:340
 #, python-format
 msgid "Suggestion: %s"
 msgstr ""
 
-#  "Conectado a %s"
 #: ../extensions/deviceicon/network.py:349
 #, python-format
 msgid "Connected for %s"
 msgstr ""
 
-#  "%d KB"
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
 #, python-format
 msgid "%d KB"
 msgstr ""
 
-#  "Revise la configuración de su Pin/Puk."
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
 msgstr ""
 
-#  "Revise la configuración del nombre de su punto de acceso (APN)"
 #: ../extensions/deviceicon/network.py:364
 msgid "Check your Access Point Name (APN) configuration"
 msgstr ""
 
-#  "Revise el Número en la configuración."
 #: ../extensions/deviceicon/network.py:368
 msgid "Check the Number configuration."
 msgstr ""
 
-#  "Revise su configuración."
 #: ../extensions/deviceicon/network.py:370
 msgid "Check your configuration."
 msgstr ""
 
-#  "Red Malla"
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#  "Red Malla %s"
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#  "No se dispone de conexión GSM."
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#  "Crear una conexión en el panel de control."
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
-#  "Mis parlantes"
 #: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
 msgstr ""
 
-#  "Dar voz"
 #: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
 
-#  "Silenciar"
 #: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
 msgstr ""
 
-#  "dedo"
 #: ../extensions/deviceicon/touchpad.py:38
 msgid "finger"
 msgstr ""
 
-#  "estilo"
 #: ../extensions/deviceicon/touchpad.py:39
 msgid "stylus"
 msgstr ""
 
-#  "Mi superficie táctil"
 #: ../extensions/deviceicon/touchpad.py:68
 msgid "My touchpad"
 msgstr ""
 
-#  "Malla"
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr ""
 
-#  "Grupo"
 #: ../extensions/globalkey/screenshot.py:61
 #: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Group"
 msgstr ""
 
-#  "Hogar"
 #: ../extensions/globalkey/screenshot.py:63
 #: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Home"
 msgstr ""
 
-#  "Actividad"
 #: ../extensions/globalkey/screenshot.py:69
 #: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "Activity"
 msgstr ""
 
-#  "Captura de pantalla"
 #: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr ""
 
-#  "Captura pantalla de \"%s\""
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr ""
 
-
-#  "\"disabled\" (desactivado) para preguntar apodo al inicio; \"system\" (sistema) "
-#  "para reutilizar el nombre largo de la cuenta UNIX."
 #: ../data/sugar.schemas.in.h:1
 msgid ""
 "\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
 "long name."
 msgstr ""
 
-#  "Directorios adicionales que pueden contener traducciones actualizadas."
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#  "URL de Respaldo"
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
 msgstr ""
 
-#  "Bundle IDs de actividades protegidas"
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
 msgstr ""
 
-
-#  "El color para el ícono del XO se utiliza en todo el escritorio. La cadena "
-#  "está compuesta por el trazo y color de relleno de color, el formato es el de "
-#  "colores RGB. Ejemplo: #AC32FF, #9A5200"
 #: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
@@ -782,149 +630,116 @@ msgid ""
 "Example: #AC32FF,#9A5200"
 msgstr ""
 
-#  "Retraso de las Esquinas"
 #: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr ""
 
-#  "Tipo de letra predeterminado"
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
 msgstr ""
 
-#  "Tamaño de letra predeterminado"
 #: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
 msgstr ""
 
-#  "Apodo predeterminado"
 #: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
 msgstr ""
 
-#  "Retraso para la activación del cuadro utilizando las esquinas."
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#  "Retraso para la activación del cuadro utilizando los bordes."
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#  "Directorio a buscar para traducciones"
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
 msgstr ""
 
-#  "Retraso del Borde"
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#  "Diseño de favoritos"
 #: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#  "Modo de reanudar favoritos"
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#  "Tipo de letra que se utiliza en todo el escritorio."
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#  "Tamaño de letra que se utiliza en todo el escritorio."
 #: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#  "APN de la red GSM"
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
 msgstr ""
 
-#  "PIN de la red GSM"
 #: ../data/sugar.schemas.in.h:19
 msgid "GSM network PIN"
 msgstr ""
 
-#  "PUK de la red GSM"
 #: ../data/sugar.schemas.in.h:20
 msgid "GSM network PUK"
 msgstr ""
 
-#  "Configuración del nombre del punto de acceso (APN) de la red GSM"
 #: ../data/sugar.schemas.in.h:21
 msgid "GSM network access point name configuration"
 msgstr ""
 
-#  "Número de la red GSM"
 #: ../data/sugar.schemas.in.h:22
 msgid "GSM network number"
 msgstr ""
 
-#  "Contraseña de la red GSM"
 #: ../data/sugar.schemas.in.h:23
 msgid "GSM network password"
 msgstr ""
 
-#  "Configuración de la contraseña de la red GSM"
 #: ../data/sugar.schemas.in.h:24
 msgid "GSM network password configuration"
 msgstr ""
 
-#  "Configuración del numero de identificación personal (PIN) de la red GSM"
 #: ../data/sugar.schemas.in.h:25
 msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#  "Configuración de la clave de desbloqueo personal (PUK) de la red GSM"
 #: ../data/sugar.schemas.in.h:26
 msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#  "Configuración del número de teléfono de la red GSM"
 #: ../data/sugar.schemas.in.h:27
 msgid "GSM network telephone number configuration"
 msgstr ""
 
-#  "Nombre de usuario de la red GSM"
 #: ../data/sugar.schemas.in.h:28
 msgid "GSM network username"
 msgstr ""
 
-#  "Configuración del nombre de usuario de la red GSM"
 #: ../data/sugar.schemas.in.h:29
 msgid "GSM network username configuration"
 msgstr ""
 
-
-#  "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor "
-#  "Jabber."
 #: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#  "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"."
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#  "Si es TRUE, Azúcar mostrará una opción \"Reiniciar Sesión\"."
 #: ../data/sugar.schemas.in.h:32
 msgid "If TRUE, Sugar will show a \"Restart\" option."
 msgstr ""
 
-
-#  "Sí es TRUE, Azúcar mostrara las redes ad-hoc predefinidas para canales 1,6, "
-#  "y 11. Sí Azúcar no ve redes conocidas cuando inicia, se conectará "
-#  "automáticamente a una red ad-hoc."
 #: ../data/sugar.schemas.in.h:33
 msgid ""
 "If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
@@ -932,159 +747,122 @@ msgid ""
 "hoc network."
 msgstr ""
 
-#  "Servidor Jabber"
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
-#  "Distribuciones del teclado"
 #: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr ""
 
-#  "Modelo del teclado"
 #: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr ""
 
-#  "Opciones del teclado"
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr ""
 
-#  "Distribución de las actividades favoritas."
 #: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-
-#  "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma "
-#  "distribución(variante)"
 #: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#  "Lista de las opciones del teclado."
 #: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr ""
 
-#  "Manejo automática de energía"
 #: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#  "Manejo automática de energía."
 #: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#  "Manejo extremo de energía"
 #: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#  "Manejo extremo de energía."
 #: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#  "Publicar en Gadget"
 #: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#  "Configuración para silenciar el dispositivo de sonido."
 #: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
 
-#  "Mostrar Terminar Sesión"
 #: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr ""
 
-#  "Mostrar Reiniciar"
 #: ../data/sugar.schemas.in.h:48
 msgid "Show Restart"
 msgstr ""
 
-#  "Mostrar redes específicas de Azúcar"
 #: ../data/sugar.schemas.in.h:49
 msgid "Show Sugar Ad-hoc networks"
 msgstr ""
 
-#  "Sonido silenciado"
 #: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr ""
 
-#  "El modelo del teclado que se utilizará"
 #: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr ""
 
-#  "Configuración de zona horaria para el sistema."
 #: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#  "URL del servidor de Jabber para usar."
 #: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#  "URL donde se guarda el backup."
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
 
-#  "Color del usuario"
 #: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr ""
 
-#  "Nombre de usuario"
 #: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr ""
 
-#  "Nombre de usuario que se utiliza en todo el escritorio."
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-
-#  "Usuarios que no se les permitirá borrar actividades a través de la vista de "
-#  "lista."
 #: ../data/sugar.schemas.in.h:59
 msgid ""
 "Users will not be allowed to erase these activities through the list view."
 msgstr ""
 
-#  "Nivel de volumen"
 #: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr ""
 
-#  "Nivel de volumen para el dispositivo de sonido."
 #: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-
-#  "Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa "
-#  "que se retome la última entrada de esa actividad."
 #: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
 msgstr ""
 
-
-#  "sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: "
-#  "módulo %s: %r"
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
@@ -1092,29 +870,16 @@ msgid ""
 "%s module: %r"
 msgstr ""
 
-#  "sugar-control-panel: clave=%s no es una opción disponible"
 #: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#  "sugar-control-panel: %s"
 #: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-
-#  "Uso: sugar-control-panel [ opción ] clave [ args ... ] \n"
-#  "    Control para el ambiente de sugar. \n"
-#  "    Opciones: \n"
-#  "    -h               muestra este mensaje de ayuda y sale \n"
-#  "    -l                enumera todas las opciones disponibles \n"
-#  "    -h clave       muestra la información sobre esta clave \n"
-#  "    -g clave       obtiene el valor actual de la clave \n"
-#  "    -s clave       establece el valor actual de la clave \n"
-#  "    -c clave  vaciar el valor actual de la clave \n"
-#  "    "
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
 #: ../src/jarabe/controlpanel/cmd.py:38
@@ -1131,1010 +896,824 @@ msgid ""
 "    "
 msgstr ""
 
-#  "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#  "Advertencia"
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr ""
 
-#  "Los cambios requieren reiniciar"
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#  "Cancelar cambios"
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#  "Después"
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#  "Reiniciar ahora"
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
-#  "Hecho"
 #: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr ""
 
-#  "Aceptar"
 #: ../src/jarabe/controlpanel/toolbar.py:125
 #: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
 msgstr ""
 
-#  "Versión %s"
 #: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr ""
 
-#  "Confirmar borrado"
 #: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr ""
 
-#  "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?"
 #: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr ""
 
-#  "Guardar"
 #: ../src/jarabe/desktop/activitieslist.py:362
 #: ../src/jarabe/frame/clipboardmenu.py:67
 #: ../src/jarabe/view/viewsource.py:280
 msgid "Keep"
 msgstr ""
 
-#  "Borrar"
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
 
-#  "Remover favorito"
 #: ../src/jarabe/desktop/activitieslist.py:435
 msgid "Remove favorite"
 msgstr ""
 
-#  "Hacer favorito"
 #: ../src/jarabe/desktop/activitieslist.py:439
 msgid "Make favorite"
 msgstr ""
 
-#  "Forma libre"
 #. TRANS: label for the freeform layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr ""
 
-#  "Anillo"
 #. TRANS: label for the ring layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr ""
 
-#  "Espiral"
 #. TRANS: label for the spiral layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr ""
 
-#  "Caja"
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr ""
 
-#  "Triángulo"
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr ""
 
-#  "Error al registrar"
 #: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
 
-#  "%s"
 #: ../src/jarabe/desktop/favoritesview.py:339
 #, python-format
 msgid "%s"
 msgstr ""
 
-#  "Registro exitoso"
 #: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#  "Ahora estás registrado en el servidor de colegio."
 #: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
 
-#  "Registro"
 #: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
 msgstr ""
 
-#  "Registrar nuevamente"
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
 msgid "Register again"
 msgstr ""
 
-#  "Actualización de Software"
 #: ../src/jarabe/desktop/homebox.py:66
 msgid "Software Update"
 msgstr ""
 
-
-#  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
 
-#  "Pruebe ahora"
 #: ../src/jarabe/desktop/homebox.py:76
 msgid "Check now"
 msgstr ""
 
-#  "Vista en lista"
 #: ../src/jarabe/desktop/homebox.py:197
 msgid "List view"
 msgstr ""
 
-#  "<Ctrl>2"
 #: ../src/jarabe/desktop/homebox.py:198
 msgid "<Ctrl>2"
 msgstr ""
 
-#  "Vista de favoritos"
 #: ../src/jarabe/desktop/homebox.py:253
 msgid "Favorites view"
 msgstr ""
 
-#  "<Ctrl>1"
 #: ../src/jarabe/desktop/homebox.py:254
 msgid "<Ctrl>1"
 msgstr ""
 
-#  "Tipo de clave:"
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr ""
 
-#  "Tipo de autenticación:"
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#  "WPA y WPA2 Personal"
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#  "Seguridad inalámbrica:"
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr ""
 
-#  "Retomar"
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr ""
 
-#  "Unirse"
 #: ../src/jarabe/desktop/meshbox.py:96
 #: ../src/jarabe/frame/activitiestray.py:182
 msgid "Join"
 msgstr ""
 
-#  "Red específica %d"
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#  "Red Malla %d"
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr ""
 
-#  "No se puede conectar al servidor."
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr ""
 
-#  "El servidor no pudo completar el pedido."
 #: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
 
-#  "Rechazar"
 #: ../src/jarabe/frame/activitiestray.py:187
 #: ../src/jarabe/frame/activitiestray.py:574
 msgid "Decline"
 msgstr ""
 
-#  "%dB"
 #: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
 msgid "%dB"
 msgstr ""
 
-#  "%dKB"
 #: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
 msgid "%dKB"
 msgstr ""
 
-#  "%dMB"
 #: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
 msgid "%dMB"
 msgstr ""
 
-#  "%s de %s"
 #: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
 msgid "%s of %s"
 msgstr ""
 
-#  "Transferencia desde %s"
 #: ../src/jarabe/frame/activitiestray.py:558
 #, python-format
 msgid "Transfer from %s"
 msgstr ""
 
-#  "Aceptar"
 #: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
 msgstr ""
 
-#  "%s (%s)"
 #: ../src/jarabe/frame/activitiestray.py:592
 #: ../src/jarabe/frame/activitiestray.py:722
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#  "Descartar"
 #: ../src/jarabe/frame/activitiestray.py:626
 #: ../src/jarabe/frame/activitiestray.py:639
 #: ../src/jarabe/frame/activitiestray.py:757
 msgid "Dismiss"
 msgstr ""
 
-#  "El otro participante canceló la transferencia del archivo"
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#  "Transferir a %s"
 #: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
 msgid "Transfer to %s"
 msgstr ""
 
-#  "Eliminar"
 #: ../src/jarabe/frame/clipboardmenu.py:56
+msgctxt "Clipboard"
 msgid "Remove"
 msgstr ""
 
-#  "Abrir"
 #: ../src/jarabe/frame/clipboardmenu.py:62
 #: ../src/jarabe/frame/clipboardmenu.py:85
 msgid "Open"
 msgstr ""
 
-#  "Abrir con"
 #: ../src/jarabe/frame/clipboardmenu.py:90
 msgid "Open with"
 msgstr ""
 
-#  "recorte de %s"
 #: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr ""
 
-#  "Vecindario"
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
 msgstr ""
 
-#  "F1"
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "F1"
 msgstr ""
 
-#  "F2"
 #: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "F2"
 msgstr ""
 
-#  "F3"
 #: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "F3"
 msgstr ""
 
-#  "F4"
 #: ../src/jarabe/frame/zoomtoolbar.py:45
 msgid "F4"
 msgstr ""
 
-#  "Nombre:"
 #: ../src/jarabe/intro/window.py:90
 msgid "Name:"
 msgstr ""
 
-#  "Clic para cambiar de color:"
 #: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr ""
 
-#  "Atrás"
 #: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr ""
 
-#  "Siguiente"
 #: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr ""
 
-#  "Sin título"
 #: ../src/jarabe/journal/expandedentry.py:156
 #: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
 #: ../src/jarabe/journal/volumestoolbar.py:130
 msgid "Untitled"
 msgstr ""
 
-#  "Sin vista previa"
 #: ../src/jarabe/journal/expandedentry.py:245
 msgid "No preview"
 msgstr ""
 
-#  "Tipo: %s"
 #: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
 msgstr ""
 
-#  "Desconocido"
 #: ../src/jarabe/journal/expandedentry.py:264
 #: ../src/jarabe/journal/listmodel.py:150
 #: ../src/jarabe/journal/listmodel.py:158
 msgid "Unknown"
 msgstr ""
 
-#  "Fecha: %s"
 #: ../src/jarabe/journal/expandedentry.py:265
 #, python-format
 msgid "Date: %s"
 msgstr ""
 
-#  "Tamaño: %s"
 #: ../src/jarabe/journal/expandedentry.py:266
 #, python-format
 msgid "Size: %s"
 msgstr ""
 
-#  "Sin fecha"
 #: ../src/jarabe/journal/expandedentry.py:294
 #: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr ""
 
-#  "Participantes:"
 #: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
 
-#  "Descripción:"
 #: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
 msgstr ""
 
-#  "Etiquetas:"
 #: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
 msgstr ""
 
-#  "Diario"
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#  "Buscar"
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#  "Cualquier momento"
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#  "Hoy"
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#  "Desde ayer"
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
-#  "Última semana"
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
-#  "Último mes"
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
-#  "Último año"
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#  "Cualquiera"
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#  "Mis amigos"
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#  "Mi clase"
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#  "Cualquiera"
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#  "Copiar a"
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#  "Duplicar"
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#  "Error mientras se copiaba la entrada. %s"
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#  "Error"
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
-#  "Iniciar"
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#  "Ordenar por fecha de modificación"
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#  "Ordenar por fecha de creación"
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#  "Ordenar por tamaño"
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#  "Ordenar vista"
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
-#  "Su diario está vacío"
 #: ../src/jarabe/journal/listview.py:316
 msgid "Your Journal is empty"
 msgstr ""
 
-#  "Tu carpeta de documentos está vacía"
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
 msgstr ""
 
-#  "El dispositivo está vacío"
 #: ../src/jarabe/journal/listview.py:321
 msgid "The device is empty"
 msgstr ""
 
-#  "No hay entradas coincidentes"
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr ""
 
-#  "Limpiar búsqueda"
 #: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
 msgstr ""
 
-#  "Versión más antigua de la actividad %s"
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
 msgid "Older Version Of %s Activity"
 msgstr ""
 
-#  "¿Desea instalar la versión %s, mas antigua?    "
 #: ../src/jarabe/journal/misc.py:274
 #, python-format
 msgid "Do you want to downgrade to version %s"
 msgstr ""
 
-#  "Su diario está lleno"
 #: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr ""
 
-
-#  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
-#  "nuevas entradas."
 #: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
 
-#  "Mostrar diario"
 #: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr ""
 
-#  "Escoja un objeto"
 #: ../src/jarabe/journal/objectchooser.py:146
 msgid "Choose an object"
 msgstr ""
 
-#  "Cerrar"
 #: ../src/jarabe/journal/objectchooser.py:151
 #: ../src/jarabe/view/viewsource.py:410
 msgid "Close"
 msgstr ""
 
-#  "Reiniciar con"
 #: ../src/jarabe/journal/palettes.py:72
 msgid "Resume with"
 msgstr ""
 
-#  "Empezar con"
 #: ../src/jarabe/journal/palettes.py:75
 msgid "Start with"
 msgstr ""
 
-#  "No se encontró una actividad para iniciar la entrada"
 #: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
 msgid "No activity to start entry"
 msgstr ""
 
-#  "Enviar a"
 #: ../src/jarabe/journal/palettes.py:112
 msgid "Send to"
 msgstr ""
 
-#  "Ver detalles"
 #: ../src/jarabe/journal/palettes.py:121
 msgid "View Details"
 msgstr ""
 
-#  "Las entradas sin un archivo no pueden ser enviadas."
 #: ../src/jarabe/journal/palettes.py:160
 msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#  "Entradas sin un archivo no pueden ser copiadas."
 #: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
 #: ../src/jarabe/journal/volumestoolbar.py:306
 msgid "Entries without a file cannot be copied."
 msgstr ""
 
-#  "Portapapeles"
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
 msgstr ""
 
-#  "No hay amigos presentes"
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
 msgstr ""
 
-#  "No se encontró una conexión válida"
 #: ../src/jarabe/journal/palettes.py:327
 msgid "No valid connection found"
 msgstr ""
 
-#  "No se encontró una actividad para retomar la entrada"
 #: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
 
-#  "Documentos"
 #: ../src/jarabe/journal/volumestoolbar.py:209
 msgid "Documents"
 msgstr ""
 
-#  "%(free_space)d MB libres"
 #: ../src/jarabe/journal/volumestoolbar.py:391
 #: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
 #, python-format
 msgid "%(free_space)d MB Free"
 msgstr ""
 
-#  "La razón para el cambio de estado del dispositivo es desconocida."
 #: ../src/jarabe/model/network.py:163
 msgid "The reason for the device state change is unknown."
 msgstr ""
 
-#  "El cambio de estado es normal."
 #: ../src/jarabe/model/network.py:165
 msgid "The state change is normal."
 msgstr ""
 
-#  "El dispositivo está siendo administrado."
 #: ../src/jarabe/model/network.py:167
 msgid "The device is now managed."
 msgstr ""
 
-#  "El dispositivo ya no está siendo administrado."
 #: ../src/jarabe/model/network.py:169
 msgid "The device is no longer managed."
 msgstr ""
 
-#  "El dispositivo no pudo ser preparado para su configuración."
 #: ../src/jarabe/model/network.py:171
 msgid "The device could not be readied for configuration."
 msgstr ""
 
-
-#  "La configuración IP no pudo ser reservada (no hay dirección disponible, "
-#  "tiempo fuera, etc)."
 #: ../src/jarabe/model/network.py:173
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc)."
 msgstr ""
 
-#  "La configuración IP ya no es válida."
 #: ../src/jarabe/model/network.py:176
 msgid "The IP configuration is no longer valid."
 msgstr ""
 
-#  "Claves requeridas, pero no fueron suministradas."
 #: ../src/jarabe/model/network.py:178
 msgid "Secrets were required, but not provided."
 msgstr ""
 
-
-#  "El cliente 802.1X fué desconectado del punto de acceso o del server de "
-#  "autenticación."
 #: ../src/jarabe/model/network.py:180
 msgid ""
 "The 802.1X supplicant disconnected from the access point or authentication "
 "server."
 msgstr ""
 
-#  "Configuración del cliente 802.1X fallada."
 #: ../src/jarabe/model/network.py:183
 msgid "Configuration of the 802.1X supplicant failed."
 msgstr ""
 
-#  "El cliente 802.1X ha abandonado o fallado inesperadamente."
 #: ../src/jarabe/model/network.py:185
 msgid "The 802.1X supplicant quit or failed unexpectedly."
 msgstr ""
 
-#  "El cliente 802.1X ha tomado demasiado tiempo para autenticar."
 #: ../src/jarabe/model/network.py:187
 msgid "The 802.1X supplicant took too long to authenticate."
 msgstr ""
 
-#  "El servicio PPP ha fallado en comenzar en el tiempo permitido."
 #: ../src/jarabe/model/network.py:189
 msgid "The PPP service failed to start within the allowed time."
 msgstr ""
 
-#  "El servicio PPP se ha desconectado inesperadamente."
 #: ../src/jarabe/model/network.py:191
 msgid "The PPP service disconnected unexpectedly."
 msgstr ""
 
-#  "El servicio PPP ha abandonado o fallado inesperadamente."
 #: ../src/jarabe/model/network.py:193
 msgid "The PPP service quit or failed unexpectedly."
 msgstr ""
 
-#  "El servicio DHCP ha fallado en comenzar en el tiempo permitido."
 #: ../src/jarabe/model/network.py:195
 msgid "The DHCP service failed to start within the allowed time."
 msgstr ""
 
-#  "El servicio DHCP ha reportado un error inesperado."
 #: ../src/jarabe/model/network.py:197
 msgid "The DHCP service reported an unexpected error."
 msgstr ""
 
-#  "El servicio DHCP ha abandonado o fallado inesperadamente."
 #: ../src/jarabe/model/network.py:199
 msgid "The DHCP service quit or failed unexpectedly."
 msgstr ""
 
-#  "El servicio de conexión compartida ha fallado al iniciar."
 #: ../src/jarabe/model/network.py:201
 msgid "The shared connection service failed to start."
 msgstr ""
 
-
-#  "El servicio de conexión compartida ha abandonado o fallado inesperadamente."
 #: ../src/jarabe/model/network.py:203
 msgid "The shared connection service quit or failed unexpectedly."
 msgstr ""
 
-#  "El servicio AutoIP ha fallado al iniciar."
 #: ../src/jarabe/model/network.py:206
 msgid "The AutoIP service failed to start."
 msgstr ""
 
-#  "El servicio AutoIP ha reportado un error inesperado."
 #: ../src/jarabe/model/network.py:208
 msgid "The AutoIP service reported an unexpected error."
 msgstr ""
 
-#  "El servicio AutoIP ha abandonado o fallado inesperadamente."
 #: ../src/jarabe/model/network.py:210
 msgid "The AutoIP service quit or failed unexpectedly."
 msgstr ""
 
-#  "Conexión fallada porque la línea estaba ocupada."
 #: ../src/jarabe/model/network.py:212
 msgid "Dialing failed because the line was busy."
 msgstr ""
 
-#  "Conexión fallada porque no había tono de llamada."
 #: ../src/jarabe/model/network.py:214
 msgid "Dialing failed because there was no dial tone."
 msgstr ""
 
-#  "Conexión fallada porque no había portadora."
 #: ../src/jarabe/model/network.py:216
 msgid "Dialing failed because there was no carrier."
 msgstr ""
 
-#  "Llamada expiró por tiempo."
 #: ../src/jarabe/model/network.py:218
 msgid "Dialing timed out."
 msgstr ""
 
-#  "Llamada falló."
 #: ../src/jarabe/model/network.py:220
 msgid "Dialing failed."
 msgstr ""
 
-#  "Fallo en inicialización de modem."
 #: ../src/jarabe/model/network.py:222
 msgid "Modem initialization failed."
 msgstr ""
 
-#  "Fallo al seleccionar el punto de acceso (APN) GSM"
 #: ../src/jarabe/model/network.py:224
 msgid "Failed to select the specified GSM APN"
 msgstr ""
 
-#  "No se buscan redes."
 #: ../src/jarabe/model/network.py:226
 msgid "Not searching for networks."
 msgstr ""
 
-#  "Registración en la red fué rechazada."
 #: ../src/jarabe/model/network.py:228
 msgid "Network registration was denied."
 msgstr ""
 
-#  "Registración en la red expiró."
 #: ../src/jarabe/model/network.py:230
 msgid "Network registration timed out."
 msgstr ""
 
-#  "Falló la registración con la red GSM solicitada."
 #: ../src/jarabe/model/network.py:232
 msgid "Failed to register with the requested GSM network."
 msgstr ""
 
-#  "Control de PIN fallado."
 #: ../src/jarabe/model/network.py:234
 msgid "PIN check failed."
 msgstr ""
 
-#  "Firmware necesario para el dispositivo puede faltar."
 #: ../src/jarabe/model/network.py:236
 msgid "Necessary firmware for the device may be missing."
 msgstr ""
 
-#  "El dispositivo fué quitado."
 #: ../src/jarabe/model/network.py:238
 msgid "The device was removed."
 msgstr ""
 
-#  "NetworkManager fue dormido."
 #: ../src/jarabe/model/network.py:240
 msgid "NetworkManager went to sleep."
 msgstr ""
 
-
-#  "Las conexiones activas del dispositivo fueron removidas o desaparecieron."
 #: ../src/jarabe/model/network.py:242
 msgid "The device's active connection was removed or disappeared."
 msgstr ""
 
-#  "Un usuario o cliente solicitó la desconexión."
 #: ../src/jarabe/model/network.py:245
 msgid "A user or client requested the disconnection."
 msgstr ""
 
-#  "La portadora/link del dispositivo a cambiado."
 #: ../src/jarabe/model/network.py:247
 msgid "The device's carrier/link changed."
 msgstr ""
 
-#  "Remover amigo"
 #: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
 msgstr ""
 
-#  "Agregar amigo"
 #: ../src/jarabe/view/buddymenu.py:70
 msgid "Make friend"
 msgstr ""
 
-#  "Apagar"
 #: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
 
-#  "Reiniciar"
 #: ../src/jarabe/view/buddymenu.py:95
 msgid "Restart"
 msgstr ""
 
-#  "Salir"
 #: ../src/jarabe/view/buddymenu.py:101
 msgid "Logout"
 msgstr ""
 
-#  "Mis ajustes"
 #: ../src/jarabe/view/buddymenu.py:106
 msgid "My Settings"
 msgstr ""
 
-#  "Invitar a %s"
 #: ../src/jarabe/view/buddymenu.py:142
 #, python-format
 msgid "Invite to %s"
 msgstr ""
 
-#  "<b>%s</b> falló al iniciar."
 #: ../src/jarabe/view/launcher.py:145
 #, python-format
 msgid "<b>%s</b> failed to start."
 msgstr ""
 
-#  "Iniciando..."
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
 msgstr ""
 
-#  "Actividad falló al iniciar"
 #: ../src/jarabe/view/palettes.py:58
 msgid "Activity failed to start"
 msgstr ""
 
-#  "Ver fuente"
 #. TODO: share-with, keep
 #: ../src/jarabe/view/palettes.py:91
 msgid "View Source"
 msgstr ""
 
-#  "Parar"
 #: ../src/jarabe/view/palettes.py:102
 msgid "Stop"
 msgstr ""
 
-#  "Empezar nuevo"
 #: ../src/jarabe/view/palettes.py:139
 msgid "Start new"
 msgstr ""
 
-#  "Mostrar contenidos"
 #: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
 msgstr ""
 
-#  "Eliminar"
 #: ../src/jarabe/view/palettes.py:229
+msgctxt "Volume"
 msgid "Remove"
 msgstr ""
 
-#  "Fuente de la instancia"
 #: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr ""
 
-#  "Fuente"
 #: ../src/jarabe/view/viewsource.py:312
 msgid "Source"
 msgstr ""
 
-#  "Fuente del paquete de la actividad"
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr ""
 
-#  "Fuente del paquete SugarToolkit"
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
 msgstr ""
 
-#  "Ver código fuente: %r"
 #: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
 #, python-format
 msgid "View source: %r"
 msgstr ""
 
-#  "Sugar en una ventana"
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
 msgstr ""
-
diff --git a/po/quz.po b/po/quz.po
index 8aac412..b195118 100644
--- a/po/quz.po
+++ b/po/quz.po
@@ -1,9 +1,12 @@
-# Amos Batto <amosbatt@yahoo.com>, 2011.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 07:47-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-11-26 08:31+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Runasimipi.org\n"
@@ -69,61 +72,57 @@ msgid "About my Computer"
 msgstr "Computadoraymanta"
 
 #  "No disponible"
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Mana jap'ikunchu"
 
 #  "%(interface)s: %(version)s"
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
 #  "Identidad"
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Kawsaypi"
 
 #  "Número de serie:"
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Yupana serial nisqa:"
 
 #  "Software"
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
 #  "Ensamble:"
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Ruwasqa kuti:"
 
 #  "Azúcar:"
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Misk'i:"
 
 #  "Firmware:"
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
 #  "Firmware de la red inalámbrica:"
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Firmware jila llika inala:"
 
 #  "Licencia y derechos de autor"
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Mañakuy Nocaq Ruaskaita"
 
-#  "Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es "
-#  "software libre, cubierto bajo la licencia GNU Licencia Publica General, y "
-#  "esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que "
-#  "se describen en ella."
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -132,7 +131,7 @@ msgid ""
 msgstr ""
 
 #  "Licencia completa:"
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Lli'punte mañakuy:"
 
@@ -234,7 +233,8 @@ msgstr "Chimpu=%s, chay simi mana riqsisqachu."
 
 #  "Lo siento, yo no hablo '%s'."
 #: ../extensions/cpsection/language/model.py:152
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Sorry I do not speak '%s'."
 msgstr "Sentine, mana rimanichi '%s'."
 
@@ -267,23 +267,18 @@ msgstr "Pakasqa simi:"
 msgid "Number:"
 msgstr "Yupana:"
 
-#  "Nombre de punto de acceso (APN):"
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
 msgstr ""
 
-#  "Número de identificación personal (PIN):"
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
 msgstr ""
 
-#  "Clave personal de desbloqueo (PUK):"
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
 msgstr ""
 
-#  "Necesitará proveer la información siguiente para configurar una conexión de "
-#  "banda ancha (3G) de red de telefonía celular."
 #: ../extensions/cpsection/modemconfiguration/view.py:175
 msgid ""
 "You will need to provide the following information to set up a mobile "
@@ -301,12 +296,10 @@ msgstr "Llik'a"
 msgid "State is unknown."
 msgstr "Ima mana riqsisqa."
 
-#  "Error en argumento especificado de radio use on/off."
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr ""
 
-#  "Error en argumento especificado use 0/1."
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr ""
@@ -316,7 +309,6 @@ msgstr ""
 msgid "Wireless"
 msgstr "Inalámbrica"
 
-#  "Apague la radio inalámbrica y ahorre vida de batería"
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr ""
@@ -326,7 +318,6 @@ msgstr ""
 msgid "Radio"
 msgstr "Uyarinapaq"
 
-#  "Descarte el historial de la red si tiene problemas de conexión"
 #: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
@@ -341,8 +332,6 @@ msgstr "Llik'amanta yuyarinata chinkachiy"
 msgid "Collaboration"
 msgstr "Yanapanakuna"
 
-#  "El servidor es equivalente al cuarto en el cual se esta; la gente en el "
-#  "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red."
 #: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
@@ -360,12 +349,10 @@ msgstr "Sirwidur:"
 msgid "Power"
 msgstr "Atina"
 
-#  "Error en argumento automático de manejo de energía, use on/off."
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 
-#  "Error en argumento extremo de manejo de energía, use on/off."
 #: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr ""
@@ -375,13 +362,10 @@ msgstr ""
 msgid "Power management"
 msgstr "Energia nisqap kamachinan"
 
-#  "Manejo automático de energía (incrementa la vida de la batería)"
 #: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 
-#  "Manejo extremo de energía (deshabilita el radio wireless, incrementa la "
-#  "duración de la batería)"
 #: ../extensions/cpsection/power/view.py:86
 msgid ""
 "Extreme power management (disables wireless radio, increases battery life)"
@@ -392,8 +376,6 @@ msgstr ""
 msgid "Software update"
 msgstr "Software kunanchana"
 
-#  "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
-#  "de seguridad y proveen nuevas características."
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
@@ -534,26 +516,26 @@ msgstr "Direccion IP: %s"
 #  "Desconectar"
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "T'aqachiy"
 
 #  "Conectando..."
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "T'inkichachkan..."
 
 #  "Conectado"
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "T'inkisqa"
 
@@ -562,7 +544,6 @@ msgstr "T'inkisqa"
 msgid "No wireless connection"
 msgstr "Inalámbrica t'inkina mana kanchu"
 
-#  "Canal"
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr ""
@@ -572,7 +553,6 @@ msgstr ""
 msgid "Wired Network"
 msgstr "Cableada llik'a"
 
-#  "Velocidad"
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
 msgstr ""
@@ -589,9 +569,9 @@ msgstr "Suyariy..."
 
 #  "Conectar"
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "T'inkiy"
 
@@ -610,7 +590,6 @@ msgstr "Mana t'inkisqachu"
 msgid "Cancel"
 msgstr "Chinkachiy"
 
-#  "Probar la conexión nuevamente"
 #: ../extensions/deviceicon/network.py:333
 msgid "Try connection again"
 msgstr ""
@@ -627,7 +606,6 @@ msgstr "Pantay: %s"
 msgid "Suggestion: %s"
 msgstr "Allinchanapaq: %s"
 
-#  "Conectado a %s"
 #: ../extensions/deviceicon/network.py:349
 #, python-format
 msgid "Connected for %s"
@@ -661,23 +639,21 @@ msgid "Check your configuration."
 msgstr "Kamachinaykita chiqaqchay."
 
 #  "Red Malla"
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Red Malla"
 
 #  "Red Malla %s"
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Red Malla %s"
 
-#  "No se dispone de conexión GSM."
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#  "Crear una conexión en el panel de control."
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -686,7 +662,6 @@ msgstr ""
 msgid "My Speakers"
 msgstr "Parlante nisqaykuna"
 
-#  "Dar voz"
 #: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
 msgstr ""
@@ -711,7 +686,6 @@ msgstr "qillqana"
 msgid "My touchpad"
 msgstr "Mi superficie táctil"
 
-#  "Malla"
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr ""
@@ -734,43 +708,33 @@ msgstr "Wasi"
 msgid "Activity"
 msgstr "Ruwana"
 
-#  "Captura de pantalla"
 #: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr ""
 
-#  "Captura pantalla de \"%s\""
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr ""
 
-#  "\"disabled\" (desactivado) para preguntar apodo al inicio; \"system\" (sistema) "
-#  "para reutilizar el nombre largo de la cuenta UNIX."
 #: ../data/sugar.schemas.in.h:1
 msgid ""
 "\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
 "long name."
 msgstr ""
 
-#  "Directorios adicionales que pueden contener traducciones actualizadas."
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
 msgstr ""
 
-#  "URL de Respaldo"
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
 msgstr ""
 
-#  "Bundle IDs de actividades protegidas"
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
 msgstr ""
 
-#  "El color para el ícono del XO se utiliza en todo el escritorio. La cadena "
-#  "está compuesta por el trazo y color de relleno de color, el formato es el de "
-#  "colores RGB. Ejemplo: #AC32FF, #9A5200"
 #: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
@@ -783,142 +747,112 @@ msgstr ""
 msgid "Corner Delay"
 msgstr "K'uchupi suyana"
 
-#  "Tipo de letra predeterminado"
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
 msgstr ""
 
-#  "Tamaño de letra predeterminado"
 #: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
 msgstr ""
 
-#  "Apodo predeterminado"
 #: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
 msgstr ""
 
-#  "Retraso para la activación del cuadro utilizando las esquinas."
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr ""
 
-#  "Retraso para la activación del cuadro utilizando los bordes."
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr ""
 
-#  "Directorio a buscar para traducciones"
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
 msgstr ""
 
-#  "Retraso del Borde"
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr ""
 
-#  "Diseño de favoritos"
 #: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr ""
 
-#  "Modo de reanudar favoritos"
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr ""
 
-#  "Tipo de letra que se utiliza en todo el escritorio."
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
 msgstr ""
 
-#  "Tamaño de letra que se utiliza en todo el escritorio."
 #: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
 msgstr ""
 
-#  "APN de la red GSM"
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
 msgstr ""
 
-#  "PIN de la red GSM"
 #: ../data/sugar.schemas.in.h:19
 msgid "GSM network PIN"
 msgstr ""
 
-#  "PUK de la red GSM"
 #: ../data/sugar.schemas.in.h:20
 msgid "GSM network PUK"
 msgstr ""
 
-#  "Configuración del nombre del punto de acceso (APN) de la red GSM"
 #: ../data/sugar.schemas.in.h:21
 msgid "GSM network access point name configuration"
 msgstr ""
 
-#  "Número de la red GSM"
 #: ../data/sugar.schemas.in.h:22
 msgid "GSM network number"
 msgstr ""
 
-#  "Contraseña de la red GSM"
 #: ../data/sugar.schemas.in.h:23
 msgid "GSM network password"
 msgstr ""
 
-#  "Configuración de la contraseña de la red GSM"
 #: ../data/sugar.schemas.in.h:24
 msgid "GSM network password configuration"
 msgstr ""
 
-#  "Configuración del numero de identificación personal (PIN) de la red GSM"
 #: ../data/sugar.schemas.in.h:25
 msgid "GSM network personal identification number configuration"
 msgstr ""
 
-#  "Configuración de la clave de desbloqueo personal (PUK) de la red GSM"
 #: ../data/sugar.schemas.in.h:26
 msgid "GSM network personal unlock key configuration"
 msgstr ""
 
-#  "Configuración del número de teléfono de la red GSM"
 #: ../data/sugar.schemas.in.h:27
 msgid "GSM network telephone number configuration"
 msgstr ""
 
-#  "Nombre de usuario de la red GSM"
 #: ../data/sugar.schemas.in.h:28
 msgid "GSM network username"
 msgstr ""
 
-#  "Configuración del nombre de usuario de la red GSM"
 #: ../data/sugar.schemas.in.h:29
 msgid "GSM network username configuration"
 msgstr ""
 
-#  "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor "
-#  "Jabber."
 #: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr ""
 
-#  "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"."
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr ""
 
-#  "Si es TRUE, Azúcar mostrará una opción \"Reiniciar Sesión\"."
 #: ../data/sugar.schemas.in.h:32
 msgid "If TRUE, Sugar will show a \"Restart\" option."
 msgstr ""
 
-#  "Sí es TRUE, Azúcar mostrara las redes ad-hoc predefinidas para canales 1,6, "
-#  "y 11. Sí Azúcar no ve redes conocidas cuando inicia, se conectará "
-#  "automáticamente a una red ad-hoc."
 #: ../data/sugar.schemas.in.h:33
 msgid ""
 "If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
@@ -926,69 +860,61 @@ msgid ""
 "hoc network."
 msgstr ""
 
-#  "Servidor Jabber"
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr ""
 
 #  "Distribuciones del teclado"
+#  "Diseño(s) de teclado"
 #: ../data/sugar.schemas.in.h:35
+#, fuzzy
 msgid "Keyboard layouts"
-msgstr ""
+msgstr "Ñit'ina(kuna) chhalay"
 
 #  "Modelo del teclado"
+#  "Modelo de teclado"
 #: ../data/sugar.schemas.in.h:36
+#, fuzzy
 msgid "Keyboard model"
-msgstr ""
+msgstr "Sumaq ñit'ina chhalay"
 
-#  "Opciones del teclado"
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr ""
 
-#  "Distribución de las actividades favoritas."
 #: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr ""
 
-#  "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma "
-#  "distribución(variante)"
 #: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
 
-#  "Lista de las opciones del teclado."
 #: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr ""
 
-#  "Manejo automática de energía"
 #: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr ""
 
-#  "Manejo automática de energía."
 #: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr ""
 
-#  "Manejo extremo de energía"
 #: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr ""
 
-#  "Manejo extremo de energía."
 #: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr ""
 
-#  "Publicar en Gadget"
 #: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr ""
 
-#  "Configuración para silenciar el dispositivo de sonido."
 #: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr ""
@@ -1013,22 +939,18 @@ msgstr "Azucarpa llik'akunanta rikhurichiy"
 msgid "Sound Muted"
 msgstr "Ch'inyachisqa"
 
-#  "El modelo del teclado que se utilizará"
 #: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr ""
 
-#  "Configuración de zona horaria para el sistema."
 #: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr ""
 
-#  "URL del servidor de Jabber para usar."
 #: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr ""
 
-#  "URL donde se guarda el backup."
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr ""
@@ -1043,13 +965,10 @@ msgstr "Hap'iqmasip llimp'in"
 msgid "User Name"
 msgstr "Hap'iqmasip sutin"
 
-#  "Nombre de usuario que se utiliza en todo el escritorio."
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr ""
 
-#  "Usuarios que no se les permitirá borrar actividades a través de la vista de "
-#  "lista."
 #: ../data/sugar.schemas.in.h:59
 msgid ""
 "Users will not be allowed to erase these activities through the list view."
@@ -1060,21 +979,16 @@ msgstr ""
 msgid "Volume Level"
 msgstr "Hayk'a chanra"
 
-#  "Nivel de volumen para el dispositivo de sonido."
 #: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr ""
 
-#  "Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa "
-#  "que se retome la última entrada de esa actividad."
 #: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
 msgstr ""
 
-#  "sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: "
-#  "módulo %s: %r"
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
 msgid ""
@@ -1082,28 +996,16 @@ msgid ""
 "%s module: %r"
 msgstr ""
 
-#  "sugar-control-panel: clave=%s no es una opción disponible"
 #: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
 msgid "sugar-control-panel: key=%s not an available option"
 msgstr ""
 
-#  "sugar-control-panel: %s"
 #: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-#  "Uso: sugar-control-panel [ opción ] clave [ args ... ] \n"
-#  "    Control para el ambiente de sugar. \n"
-#  "    Opciones: \n"
-#  "    -h               muestra este mensaje de ayuda y sale \n"
-#  "    -l                enumera todas las opciones disponibles \n"
-#  "    -h clave       muestra la información sobre esta clave \n"
-#  "    -g clave       obtiene el valor actual de la clave \n"
-#  "    -s clave       establece el valor actual de la clave \n"
-#  "    -c clave  vaciar el valor actual de la clave \n"
-#  "    "
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
 #: ../src/jarabe/controlpanel/cmd.py:38
@@ -1120,36 +1022,34 @@ msgid ""
 "    "
 msgstr ""
 
-#  "Para aplicar sus cambios tiene que reiniciar Azúcar.\n"
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
 #  "Advertencia"
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Willay"
 
-#  "Los cambios requieren reiniciar"
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
 #  "Cancelar cambios"
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "T'krasqakunata chinkachiy"
 
 #  "Después"
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Qhipamanta"
 
 #  "Reiniciar ahora"
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Kunan qallariy"
 
@@ -1158,7 +1058,6 @@ msgstr "Kunan qallariy"
 msgid "Done"
 msgstr "Ruwasqaña"
 
-#  "Aceptar"
 #: ../src/jarabe/controlpanel/toolbar.py:125
 #: ../src/jarabe/desktop/favoritesview.py:347
 msgid "Ok"
@@ -1170,12 +1069,10 @@ msgstr ""
 msgid "Version %s"
 msgstr "Kuti %s"
 
-#  "Confirmar borrado"
 #: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
 msgstr ""
 
-#  "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?"
 #: ../src/jarabe/desktop/activitieslist.py:358
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
@@ -1191,7 +1088,7 @@ msgstr "Kikinchata waqaychay"
 #  "Borrar"
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Chinkachiy"
@@ -1236,7 +1133,6 @@ msgstr "Tawak'uchu"
 msgid "Triangle"
 msgstr "Kimsak'uchu"
 
-#  "Error al registrar"
 #: ../src/jarabe/desktop/favoritesview.py:338
 msgid "Registration Failed"
 msgstr ""
@@ -1247,12 +1143,10 @@ msgstr ""
 msgid "%s"
 msgstr "%s"
 
-#  "Registro exitoso"
 #: ../src/jarabe/desktop/favoritesview.py:341
 msgid "Registration Successful"
 msgstr ""
 
-#  "Ahora estás registrado en el servidor de colegio."
 #: ../src/jarabe/desktop/favoritesview.py:342
 msgid "You are now registered with your school server."
 msgstr ""
@@ -1262,7 +1156,6 @@ msgstr ""
 msgid "Register"
 msgstr "Qillqachina"
 
-#  "Registrar nuevamente"
 #: ../src/jarabe/desktop/favoritesview.py:643
 #: ../src/jarabe/desktop/favoritesview.py:660
 msgid "Register again"
@@ -1273,7 +1166,6 @@ msgstr ""
 msgid "Software Update"
 msgstr "Software kunanchana"
 
-#  "Actualice sus actividades para asegurar compatibilidad con su nuevo software"
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr ""
@@ -1303,30 +1195,33 @@ msgstr "Aqllasqakuna qhaway"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#  "Tipo de clave:"
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr ""
 
-#  "Tipo de autenticación:"
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#  "WPA y WPA2 Personal"
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#  "Seguridad inalámbrica:"
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr ""
 
 #  "Retomar"
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Hukmanta ruway"
@@ -1337,24 +1232,23 @@ msgstr "Hukmanta ruway"
 msgid "Join"
 msgstr "Huñunakuy"
 
-#  "Red específica %d"
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
 #  "Red Malla %d"
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
+#, python-format, fuzzy
 msgid "Mesh Network %d"
-msgstr ""
+msgstr "Red Malla %d"
 
 #  "No se puede conectar al servidor."
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
 msgstr "Servidorman mana t'inkiyta atinchu."
 
-#  "El servidor no pudo completar el pedido."
 #: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
 msgstr ""
@@ -1414,7 +1308,6 @@ msgstr "%s (%s)"
 msgid "Dismiss"
 msgstr "Qhichuy"
 
-#  "El otro participante canceló la transferencia del archivo"
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
 msgstr ""
@@ -1425,8 +1318,10 @@ msgstr ""
 msgid "Transfer to %s"
 msgstr "%s man apachiy"
 
-#  "Eliminar"
+# "Eliminar"
+#  msgctxt "Clipboard"
 #: ../src/jarabe/frame/clipboardmenu.py:56
+#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
 msgstr "Chinkachiy"
@@ -1505,7 +1400,6 @@ msgstr "Mana sutiyuq"
 msgid "No preview"
 msgstr "Qhawanaraq mana kanchu"
 
-#  "Tipo: %s"
 #: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Kind: %s"
@@ -1536,7 +1430,6 @@ msgstr "Sayaynin: %s"
 msgid "No date"
 msgstr "Mana p'unchawyuq"
 
-#  "Participantes:"
 #: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
 msgstr ""
@@ -1551,87 +1444,83 @@ msgstr "Aswan willay:"
 msgid "Tags:"
 msgstr "Sutichaq:"
 
-#  "Diario"
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
 #  "Buscar"
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Maskhay"
 
 #  "Cualquier momento"
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Tukuy pacha"
 
 #  "Hoy"
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Kunan p'unchaw"
 
 #  "Desde ayer"
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Qaynamanta"
 
 #  "Última semana"
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Ñawpaq semana"
 
 #  "Último mes"
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Ñawpaq killa"
 
 #  "Último año"
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Ñawpaq wata"
 
-#  "Cualquiera"
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
 #  "Mis amigos"
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Masiykuna"
 
 #  "Mi clase"
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 #, fuzzy
 msgid "My class"
 msgstr "Clase nisqay"
 
-#  "Cualquiera"
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
 #  "Copiar a"
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Mayman kikinchay"
 
 #  "Duplicar"
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Kikinchay"
 
-#  "Error mientras se copiaba la entrada. %s"
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
@@ -1639,7 +1528,7 @@ msgid "Error while copying the entry. %s"
 msgstr ""
 
 #  "Error"
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1647,29 +1536,27 @@ msgstr "Pantay"
 
 #  "Iniciar"
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Qallariy"
 
 #  "Ordenar por fecha de modificación"
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 #, fuzzy
 msgid "Sort by date modified"
 msgstr "P'unchaywan siqichay"
 
-#  "Ordenar por fecha de creación"
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
 #  "Ordenar por tamaño"
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Sayayninwan siqichay"
 
-#  "Ordenar vista"
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
@@ -1688,7 +1575,6 @@ msgstr "Wayaqaykiqa chusaq kachkan"
 msgid "The device is empty"
 msgstr "Dispositivo nisqaqa chusaq kachkan"
 
-#  "No hay entradas coincidentes"
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
 msgstr ""
@@ -1698,7 +1584,6 @@ msgstr ""
 msgid "Clear search"
 msgstr "Maskhanata pichay"
 
-#  "Versión más antigua de la actividad %s"
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
 msgid "Older Version Of %s Activity"
@@ -1715,8 +1600,6 @@ msgstr "Mawk'a %s churayta munankichu?"
 msgid "Your Journal is full"
 msgstr "Diario nisqaykiqa hunt'asqa"
 
-#  "Por favor borre algunas entradas viejas del diario para hacer espacio a las "
-#  "nuevas entradas."
 #: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr ""
@@ -1747,7 +1630,6 @@ msgstr "Imawan hukmanta qallariy"
 msgid "Start with"
 msgstr "Imawan qallariy"
 
-#  "No se encontró una actividad para iniciar la entrada"
 #: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
 msgid "No activity to start entry"
 msgstr ""
@@ -1762,12 +1644,10 @@ msgstr "Piman apachiy"
 msgid "View Details"
 msgstr "Aswan qhaway"
 
-#  "Las entradas sin un archivo no pueden ser enviadas."
 #: ../src/jarabe/journal/palettes.py:160
 msgid "Entries without a file cannot be sent."
 msgstr ""
 
-#  "Entradas sin un archivo no pueden ser copiadas."
 #: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
 #: ../src/jarabe/journal/volumestoolbar.py:306
 msgid "Entries without a file cannot be copied."
@@ -1788,7 +1668,6 @@ msgstr "Mana masikunaqa kankuchu"
 msgid "No valid connection found"
 msgstr "Mana allin t'inkinata maskhasqachu"
 
-#  "No se encontró una actividad para retomar la entrada"
 #: ../src/jarabe/journal/palettes.py:355
 msgid "No activity to resume entry"
 msgstr ""
@@ -1805,33 +1684,26 @@ msgstr "Qillqa q'ipikuna"
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d MB Qispisqa"
 
-#  "La razón para el cambio de estado del dispositivo es desconocida."
 #: ../src/jarabe/model/network.py:163
 msgid "The reason for the device state change is unknown."
 msgstr ""
 
-#  "El cambio de estado es normal."
 #: ../src/jarabe/model/network.py:165
 msgid "The state change is normal."
 msgstr ""
 
-#  "El dispositivo está siendo administrado."
 #: ../src/jarabe/model/network.py:167
 msgid "The device is now managed."
 msgstr ""
 
-#  "El dispositivo ya no está siendo administrado."
 #: ../src/jarabe/model/network.py:169
 msgid "The device is no longer managed."
 msgstr ""
 
-#  "El dispositivo no pudo ser preparado para su configuración."
 #: ../src/jarabe/model/network.py:171
 msgid "The device could not be readied for configuration."
 msgstr ""
 
-#  "La configuración IP no pudo ser reservada (no hay dirección disponible, "
-#  "tiempo fuera, etc)."
 #: ../src/jarabe/model/network.py:173
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc)."
@@ -1842,35 +1714,28 @@ msgstr ""
 msgid "The IP configuration is no longer valid."
 msgstr "IP kamachinaqa mana allinñachu."
 
-#  "Claves requeridas, pero no fueron suministradas."
 #: ../src/jarabe/model/network.py:178
 msgid "Secrets were required, but not provided."
 msgstr ""
 
-#  "El cliente 802.1X fué desconectado del punto de acceso o del server de "
-#  "autenticación."
 #: ../src/jarabe/model/network.py:180
 msgid ""
 "The 802.1X supplicant disconnected from the access point or authentication "
 "server."
 msgstr ""
 
-#  "Configuración del cliente 802.1X fallada."
 #: ../src/jarabe/model/network.py:183
 msgid "Configuration of the 802.1X supplicant failed."
 msgstr ""
 
-#  "El cliente 802.1X ha abandonado o fallado inesperadamente."
 #: ../src/jarabe/model/network.py:185
 msgid "The 802.1X supplicant quit or failed unexpectedly."
 msgstr ""
 
-#  "El cliente 802.1X ha tomado demasiado tiempo para autenticar."
 #: ../src/jarabe/model/network.py:187
 msgid "The 802.1X supplicant took too long to authenticate."
 msgstr ""
 
-#  "El servicio PPP ha fallado en comenzar en el tiempo permitido."
 #: ../src/jarabe/model/network.py:189
 msgid "The PPP service failed to start within the allowed time."
 msgstr ""
@@ -1881,67 +1746,60 @@ msgstr ""
 msgid "The PPP service disconnected unexpectedly."
 msgstr "Servicio PPP t'aqaran."
 
-#  "El servicio PPP ha abandonado o fallado inesperadamente."
+#  "El servicio PPP se ha desconectado inesperadamente."
 #: ../src/jarabe/model/network.py:193
+#, fuzzy
 msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
+msgstr "Servicio PPP t'aqaran."
 
-#  "El servicio DHCP ha fallado en comenzar en el tiempo permitido."
 #: ../src/jarabe/model/network.py:195
 msgid "The DHCP service failed to start within the allowed time."
 msgstr ""
 
-#  "El servicio DHCP ha reportado un error inesperado."
 #: ../src/jarabe/model/network.py:197
 msgid "The DHCP service reported an unexpected error."
 msgstr ""
 
-#  "El servicio DHCP ha abandonado o fallado inesperadamente."
+# "El servicio PPP se ha desconectado inesperadamente."
 #: ../src/jarabe/model/network.py:199
+#, fuzzy
 msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
+msgstr "Servicio PPP t'aqaran."
 
-#  "El servicio de conexión compartida ha fallado al iniciar."
 #: ../src/jarabe/model/network.py:201
 msgid "The shared connection service failed to start."
 msgstr ""
 
-#  "El servicio de conexión compartida ha abandonado o fallado inesperadamente."
 #: ../src/jarabe/model/network.py:203
 msgid "The shared connection service quit or failed unexpectedly."
 msgstr ""
 
-#  "El servicio AutoIP ha fallado al iniciar."
 #: ../src/jarabe/model/network.py:206
 msgid "The AutoIP service failed to start."
 msgstr ""
 
-#  "El servicio AutoIP ha reportado un error inesperado."
 #: ../src/jarabe/model/network.py:208
 msgid "The AutoIP service reported an unexpected error."
 msgstr ""
 
-#  "El servicio AutoIP ha abandonado o fallado inesperadamente."
+# "El servicio PPP se ha desconectado inesperadamente."
 #: ../src/jarabe/model/network.py:210
+#, fuzzy
 msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
+msgstr "Servicio PPP t'aqaran."
 
-#  "Conexión fallada porque la línea estaba ocupada."
 #: ../src/jarabe/model/network.py:212
 msgid "Dialing failed because the line was busy."
 msgstr ""
 
-#  "Conexión fallada porque no había tono de llamada."
 #: ../src/jarabe/model/network.py:214
 msgid "Dialing failed because there was no dial tone."
 msgstr ""
 
-#  "Conexión fallada porque no había portadora."
 #: ../src/jarabe/model/network.py:216
 msgid "Dialing failed because there was no carrier."
 msgstr ""
 
-#  "Llamada expiró por tiempo."
 #: ../src/jarabe/model/network.py:218
 msgid "Dialing timed out."
 msgstr ""
@@ -1951,67 +1809,54 @@ msgstr ""
 msgid "Dialing failed."
 msgstr "Waqyanaqa pantaran."
 
-#  "Fallo en inicialización de modem."
 #: ../src/jarabe/model/network.py:222
 msgid "Modem initialization failed."
 msgstr ""
 
-#  "Fallo al seleccionar el punto de acceso (APN) GSM"
 #: ../src/jarabe/model/network.py:224
 msgid "Failed to select the specified GSM APN"
 msgstr ""
 
-#  "No se buscan redes."
 #: ../src/jarabe/model/network.py:226
 msgid "Not searching for networks."
 msgstr ""
 
-#  "Registración en la red fué rechazada."
 #: ../src/jarabe/model/network.py:228
 msgid "Network registration was denied."
 msgstr ""
 
-#  "Registración en la red expiró."
 #: ../src/jarabe/model/network.py:230
 msgid "Network registration timed out."
 msgstr ""
 
-#  "Falló la registración con la red GSM solicitada."
 #: ../src/jarabe/model/network.py:232
 msgid "Failed to register with the requested GSM network."
 msgstr ""
 
-#  "Control de PIN fallado."
 #: ../src/jarabe/model/network.py:234
 msgid "PIN check failed."
 msgstr ""
 
-#  "Firmware necesario para el dispositivo puede faltar."
 #: ../src/jarabe/model/network.py:236
 msgid "Necessary firmware for the device may be missing."
 msgstr ""
 
-#  "El dispositivo fué quitado."
 #: ../src/jarabe/model/network.py:238
 msgid "The device was removed."
 msgstr ""
 
-#  "NetworkManager fue dormido."
 #: ../src/jarabe/model/network.py:240
 msgid "NetworkManager went to sleep."
 msgstr ""
 
-#  "Las conexiones activas del dispositivo fueron removidas o desaparecieron."
 #: ../src/jarabe/model/network.py:242
 msgid "The device's active connection was removed or disappeared."
 msgstr ""
 
-#  "Un usuario o cliente solicitó la desconexión."
 #: ../src/jarabe/model/network.py:245
 msgid "A user or client requested the disconnection."
 msgstr ""
 
-#  "La portadora/link del dispositivo a cambiado."
 #: ../src/jarabe/model/network.py:247
 msgid "The device's carrier/link changed."
 msgstr ""
@@ -2026,7 +1871,6 @@ msgstr "Masita chinkachiy"
 msgid "Make friend"
 msgstr "Masita yapay"
 
-#  "Apagar"
 #: ../src/jarabe/view/buddymenu.py:87
 msgid "Shutdown"
 msgstr ""
@@ -2048,6 +1892,7 @@ msgstr "Aqllasqaykuna"
 
 #  "Invitar a %s"
 #: ../src/jarabe/view/buddymenu.py:142
+#, python-format
 #, python-format, fuzzy
 msgid "Invite to %s"
 msgstr "%s man mink'ay"
@@ -2089,13 +1934,14 @@ msgstr "Musuqta qallariy"
 msgid "Show contents"
 msgstr "Ukhunpi qhaway"
 
-#  "Quitar"
+# "Eliminar"
+#  msgctxt "Clipboard"
 #: ../src/jarabe/view/palettes.py:229
+#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
-msgstr "Qhichuy"
+msgstr "Chinkachiy"
 
-#  "Fuente de la instancia"
 #: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
 msgstr ""
@@ -2106,12 +1952,10 @@ msgstr ""
 msgid "Source"
 msgstr "Pukyu"
 
-#  "Fuente del paquete de la actividad"
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
 msgstr ""
 
-#  "Fuente del paquete SugarToolkit"
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index a8dbe79..b5de5c2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-01-07 18:20+0000\n"
 "Last-Translator: David Lazar <david@davidlazar.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,48 +59,48 @@ msgstr ""
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -108,7 +108,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -142,6 +142,7 @@ msgid "instantaneous"
 msgstr ""
 
 #: ../extensions/cpsection/frame/view.py:29
+#, python-format
 #, python-format, fuzzy
 msgid "%s seconds"
 msgstr "%d secunde"
@@ -431,24 +432,24 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr ""
 
@@ -477,9 +478,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr ""
 
@@ -537,20 +538,20 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -901,26 +902,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr ""
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr ""
 
@@ -955,7 +956,7 @@ msgstr "Păstrează"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr ""
@@ -1047,25 +1048,32 @@ msgstr ""
 msgid "<Ctrl>1"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Reia"
@@ -1075,12 +1083,12 @@ msgstr "Reia"
 msgid "Join"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr ""
@@ -1252,101 +1260,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 3adf685..f82f87f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-09-28 19:50+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,48 +62,48 @@ msgstr "Кликните для изменения цвета:"
 msgid "About my Computer"
 msgstr "О компьютере"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Не доступно"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Идентификация"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Серийный номер:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Программное обеспечение"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Сборка:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Прошивка:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Прошивка сетевого оборудования:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Лицензионная информация"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -115,7 +115,7 @@ msgstr ""
 "License и вы можете свободно изменять и/или распространять его так как "
 "определено лицензией приведенной здесь."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Полный текст лицензионного соглашения:"
 
@@ -149,8 +149,8 @@ msgid "instantaneous"
 msgstr "мгновенно"
 
 #: ../extensions/cpsection/frame/view.py:29
-#, python-format, 
 #, python-format
+#, python-format,
 msgid "%s seconds"
 msgstr "%s секунд"
 
@@ -452,8 +452,8 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Отсоединить"
 
@@ -463,18 +463,18 @@ msgstr "Отсоединить"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Соединение..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Соединен"
 
@@ -503,9 +503,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Соединить"
 
@@ -544,8 +544,9 @@ msgstr ""
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
 #, python-format
+#, python-format, fuzzy
 msgid "%d KB"
-msgstr ""
+msgstr "%dKB"
 
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
@@ -563,20 +564,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Местная Сеть"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "Местная Сеть %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -767,8 +769,9 @@ msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr "Если TRUE, Sugar будет показывать опцию \"Завершить сеанс\"."
 
 #: ../data/sugar.schemas.in.h:32
+#, fuzzy
 msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
+msgstr "Если TRUE, Sugar будет показывать опцию \"Завершить сеанс\"."
 
 #: ../data/sugar.schemas.in.h:33
 msgid ""
@@ -948,26 +951,26 @@ msgstr ""
 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/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Изменения требуют перезапуска"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Отменить изменения"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Потом"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Перезапустить сейчас"
 
@@ -1004,7 +1007,7 @@ msgstr "Хранить"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Удалить"
@@ -1100,25 +1103,32 @@ msgstr "Любимые"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Тип ключа:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Тип аутентификации:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA и WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Продолжить"
@@ -1128,14 +1138,14 @@ msgstr "Продолжить"
 msgid "Join"
 msgstr "Присоединиться"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format, 
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
+#, python-format,
 msgid "Mesh Network %d"
 msgstr "Сеть Mesh %d"
 
@@ -1307,77 +1317,77 @@ msgid "Tags:"
 msgstr "Тэги:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Журнал"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Поиск"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Любое время"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Сегодня"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Со вчерашнего дня"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "За неделю"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "За месяц"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "За год"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Все"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Мои друзья"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Мой класс"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Всё"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1385,24 +1395,24 @@ msgstr ""
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Старт"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/rw.po b/po/rw.po
index aa493e7..5035dda 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-20 07:47-0400\n"
-"PO-Revision-Date: 2012-02-08 11:28+0200\n"
-"Last-Translator: Jimmy <jimmy@laptop.org>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-03-03 06:20+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: rw\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "Ibinyerecyeyeho"
 
 #: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
-msgstr "ugomba kwinjiza izina."
+msgstr "Ugomba kwinjiza izina."
 
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
@@ -50,12 +50,12 @@ msgstr "stroke:   %s"
 #: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
-msgstr "fill:     color=%s igihu=%s"
+msgstr "Uzuza:     ibara=%s igihu=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
-msgstr "fill:     %s"
+msgstr "Uzuza:     %s"
 
 #: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
@@ -67,67 +67,67 @@ msgstr "Ikosa mu mabara yavuzwe."
 
 #: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
-msgstr "kanda kugirango uhindure ibara:"
+msgstr "Kanda kugirango uhindure ibara:"
 
 #: ../extensions/cpsection/aboutcomputer/__init__.py:21
 msgid "About my Computer"
 msgstr "Ibyerekeye mudasobwa yanjye"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
-msgstr "ntabwo biboneka"
+msgstr "Ntibibashije kuboneka"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Ikiranga"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
-msgstr "Serial Number:"
+msgstr "Numero ya seri:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
-msgstr "porogaramu"
+msgstr "Porogaramu"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Kubaka:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Wireless Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
-msgstr "Uburenganzira bw'ikoporora na License"
+msgstr "Uburenganzira bw'ikoporora n'amabwiriza"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
 "change it and/or distribute copies of it under certain conditions described "
 "therein."
 msgstr ""
-"Sugar ni garafike user interface muri kureba.Sugar ni software "
+"Sugar ni garafike user interface muri kureba.Sugar ni porogorame "
 "y'ubuntu,igengwa na Lisense ya GNU,kandi ushobora kuyihindura cyangwa "
 "gutanga amacopies ukurikije uburenganzira bugenga ikoporora buhari."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
-msgstr "License yuzuye:"
+msgstr "Uburenganzira bwuzuye:"
 
 #: ../extensions/cpsection/datetime/__init__.py:21
 msgid "Date & Time"
@@ -135,11 +135,11 @@ msgstr "Itariki n`igihe"
 
 #: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
-msgstr "Ikosa rya timezone ntiribaho."
+msgstr "Ikosa timezone ntiribaho."
 
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
-msgstr "Timezone"
+msgstr "Igihe fatizo"
 
 #: ../extensions/cpsection/frame/__init__.py:21
 msgid "Frame"
@@ -148,7 +148,7 @@ msgstr "Frame"
 #: ../extensions/cpsection/frame/model.py:41
 #: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
-msgstr "umubare ugomba kuba udafite undi mubare inyuma yakitso."
+msgstr "Umubare ugomba kuba udafite undi mubare inyuma yakitso."
 
 #: ../extensions/cpsection/frame/view.py:27
 msgid "never"
@@ -165,7 +165,7 @@ msgstr "%s amasegonda"
 
 #: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
-msgstr "Activation Delay"
+msgstr "Gutinda kwo kwemeza"
 
 #: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
@@ -182,7 +182,7 @@ msgstr "Keyboard"
 
 #: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
-msgstr "ubwoko bwa keyboard"
+msgstr "Ubwoko bwa keyboard"
 
 #: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
@@ -199,7 +199,7 @@ msgstr "Ururimi"
 
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "Could not access ~/.i18n. Create standard settings."
+msgstr "Ntibishobotse kwinjira ~/.i18n. Rema ibipimo nyabyo."
 
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
@@ -216,7 +216,7 @@ msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
 msgstr ""
-"Ongeraho indimi mu buryo ushaka.Niba ubusobanuro butabonetse,urukurira ku "
+"Ongeraho indimi mu buryo ushaka.Niba ubusobanuro butabonetse,urukurikira ku "
 "rutonde nirwo rukoreswa."
 
 #: ../extensions/cpsection/modemconfiguration/__init__.py:21
@@ -266,7 +266,7 @@ msgstr "States ntizizwi."
 
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
-msgstr "Ikosain specified radio argument use on/off."
+msgstr "Ikosa muri argument ya radiyo yasobanuwe koresha on/off."
 
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
@@ -319,7 +319,7 @@ msgstr "Ikosa muri automatic pm argument,koresha on/off."
 
 #: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
-msgstr "Ikosa muri extreme pm argument, use on/of."
+msgstr "Ikosa muri extreme pm argument, koresha on/off."
 
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
@@ -351,7 +351,7 @@ msgstr ""
 #: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
-msgstr "kugenzura %s..."
+msgstr "Kugenzura %s..."
 
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
@@ -371,8 +371,8 @@ msgstr "Software yawe yashizwe ku gihe"
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "ushobora kwinjiza %s y'ivugurura"
-msgstr[1] "ushobora kwinjiza %s y'amavugurura"
+msgstr[0] "Ushobora kwinjiza %s y'ivugurura"
+msgstr[1] "Ushobora kwinjiza %s y'amavugurura"
 
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
@@ -457,25 +457,25 @@ msgstr "IP address: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Tandukanya"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Ihuza..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Byahujwe"
 
@@ -501,12 +501,12 @@ msgstr "Modemu idakoresha intsinga"
 
 #: ../extensions/deviceicon/network.py:281
 msgid "Please wait..."
-msgstr "ihangane gato..."
+msgstr "Ihangane gato..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Huza"
 
@@ -535,7 +535,7 @@ msgstr "Ikosa: %s"
 #: ../extensions/deviceicon/network.py:340
 #, python-format
 msgid "Suggestion: %s"
-msgstr "ibyifuzo: %s"
+msgstr "Ibyifuzo: %s"
 
 #: ../extensions/deviceicon/network.py:349
 #, python-format
@@ -564,20 +564,20 @@ msgstr "Genzura umubare w'iboneza."
 msgid "Check your configuration."
 msgstr "Genzura iboneza ryawe."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Urusobe rwa rezo"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "Rezo ya Mesh %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "Nta guhuzwa kwa GSM guhari."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "Kora ihuza muri control panel."
 
@@ -626,22 +626,24 @@ msgstr "Igikorwa"
 
 #: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
-msgstr "ifoto ya ekara"
+msgstr "Ifoto ya ekara"
 
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
-msgstr "ifoto ya ekara \"%s\""
+msgstr "Ifoto ya ekara \"%s\""
 
 #: ../data/sugar.schemas.in.h:1
 msgid ""
 "\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
 "long name."
 msgstr ""
+"\"Ntibyemejwe\" kubaza nick ku itangiriro; \"system\" kongera gukoresha konte "
+"UNIX izina rirerire."
 
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
-msgstr ""
+msgstr "Ahandi hinyongera ushobora gusanga ubusobanuro bugezweho."
 
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
@@ -649,7 +651,7 @@ msgstr "Garura URL"
 
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
-msgstr ""
+msgstr "Ibirango by'ibyegeranyo by'ibikorwa birinzwe"
 
 #: ../data/sugar.schemas.in.h:5
 msgid ""
@@ -657,6 +659,9 @@ msgid ""
 "composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
+"Ibara ry'akarango ka XO gakoreshejwe hose kuri mudasobwa. String igizwe "
+"n'ibara stroke ndetse n'ibara fill, imiterere niyamabara rgb. Urugero: "
+"#AC32FF ,#9A5200"
 
 #: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
@@ -676,11 +681,11 @@ msgstr "Nick yicyitegererezo"
 
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr ""
+msgstr "Itinda ryo kwemeza frame ukoresheje inguni"
 
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
-msgstr ""
+msgstr "Itinda ryo kwemeza frame ukoresheje impera"
 
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
@@ -700,11 +705,11 @@ msgstr "Uburyo bw'isubukura wihitiyemo"
 
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
-msgstr ""
+msgstr "Ishusho ikoreshwa kuri desktop yose."
 
 #: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
-msgstr ""
+msgstr "Ishusho ikoreshwa kuri desktop yose."
 
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
@@ -728,23 +733,23 @@ msgstr "Numero y'umuyoboro GSM"
 
 #: ../data/sugar.schemas.in.h:23
 msgid "GSM network password"
-msgstr "ijambobanga ry'umuyoboro GSM"
+msgstr "Ijambobanga ry'umuyoboro GSM"
 
 #: ../data/sugar.schemas.in.h:24
 msgid "GSM network password configuration"
-msgstr "gushyiraho ijambobanga ry'umuyoboro GSM"
+msgstr "Gushyiraho ijambobanga ry'umuyoboro GSM"
 
 #: ../data/sugar.schemas.in.h:25
 msgid "GSM network personal identification number configuration"
-msgstr ""
+msgstr "Gushyiramo ijambo riranga ryihariye ry'umuyoboro GSM"
 
 #: ../data/sugar.schemas.in.h:26
 msgid "GSM network personal unlock key configuration"
-msgstr ""
+msgstr "Gushyiramo urufunguzo rwihariye rw'umuyoboro GSM"
 
 #: ../data/sugar.schemas.in.h:27
 msgid "GSM network telephone number configuration"
-msgstr ""
+msgstr "Gushyiramo numero ya telefone y'umuyoboro GSM"
 
 #: ../data/sugar.schemas.in.h:28
 msgid "GSM network username"
@@ -763,11 +768,11 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr "Niba Ari Ukuri, Sugar irerekana amahitamo yo \"Kuvamo\""
+msgstr "Niba Ari Ukuri, Sugar irerekana amahitamo yo \"Kuvamo\"."
 
 #: ../data/sugar.schemas.in.h:32
 msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr "Niba Ari Ukuri, Sugar irerekana amahitamo yo \"Kongera gutangira\""
+msgstr "Niba Ari Ukuri, Sugar irerekana amahitamo yo \"Kongera gutangira\"."
 
 #: ../data/sugar.schemas.in.h:33
 msgid ""
@@ -775,6 +780,9 @@ msgid ""
 "Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
 "hoc network."
 msgstr ""
+"Niba ari ukuri, sugar iragaragaza imiyoboro ad-hoc y'umwimerere y'imirongo "
+"1,6 na 11. Sugar niramuka itabonye imiyoboro \"izwi\" mwitangiriro, ihita "
+"yihuza ku muyoboro Ad-hoc."
 
 #: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
@@ -786,11 +794,11 @@ msgstr "Imimerere ya keyboard "
 
 #: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
-msgstr "ubwoko bwa keyboard "
+msgstr "Ubwoko bwa keyboard "
 
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
-msgstr "ihitamo rya Keyboard "
+msgstr "Ihitamo rya Keyboard "
 
 #: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
@@ -800,6 +808,8 @@ msgstr "Ingano y'ishusho wihitiyemo."
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr ""
+"Rondora ubwoko bwa keyboard. Buri bwoko bwinjije bugomba kuba buri mu "
+"bwarondowe."
 
 #: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
@@ -815,11 +825,11 @@ msgstr "Umuriro otomatike."
 
 #: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
-msgstr ""
+msgstr "Umuriro Urengeje"
 
 #: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
-msgstr ""
+msgstr "Umuriro Urengeje."
 
 #: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
@@ -827,7 +837,7 @@ msgstr "Amamaza kuri Gadget"
 
 #: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
-msgstr "shyiraho kuzimya ijwi ry'igikoresho."
+msgstr "Shyiraho kuzimya ijwi ry'igikoresho."
 
 #: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
@@ -851,15 +861,15 @@ msgstr "Ubwoko bwa Keyboard bwo gukoreswa"
 
 #: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
-msgstr ""
+msgstr "Gushyiraho igihe fatizo."
 
 #: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
-msgstr "Url ya server jabber yo gukoreswa."
+msgstr "URL ya server jabber yo gukoreswa."
 
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
-msgstr "Url y'aho backup ibikwa."
+msgstr "URL y'aho backup ibikwa."
 
 #: ../data/sugar.schemas.in.h:56
 msgid "User Color"
@@ -871,7 +881,7 @@ msgstr "Izina ry'ukoresha"
 
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
-msgstr "izina rikoreswa kuri desktop hose."
+msgstr "Izina rikoreswa kuri desktop hose."
 
 #: ../data/sugar.schemas.in.h:59
 msgid ""
@@ -882,11 +892,11 @@ msgstr ""
 
 #: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
-msgstr "ingano y'ijwi"
+msgstr "Ingano y'ijwi"
 
 #: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
-msgstr "ingano y'ijwi y'igikoresho gisohora amajwi."
+msgstr "Ingano y'ijwi y'igikoresho gisohora amajwi."
 
 #: ../data/sugar.schemas.in.h:62
 msgid ""
@@ -920,7 +930,6 @@ msgstr "sugar-control-panel: %s"
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
 #: ../src/jarabe/controlpanel/cmd.py:38
-#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -941,33 +950,33 @@ msgstr ""
 "              -h urufunguzo          yerekana inkuru ijyanye n'uru rufunguzo\n"
 "              -g urufunguzo          izana agaciro k'urufunguzo \n"
 "              -s urufunguzo          ihindura agaciro k'urufunguzo \n"
-"              -c urufunguzo          ?????? k'urufunguzo \n"
+"              -c urufunguzo          Kuraho agaciro gasanzwe k'urufunguzo \n"
 "    "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Kugirango ibyahinduwe bikore ugomba kongera gutangira sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Icyitonderwa"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
-msgstr "impinduka zisaba kongera gutangira"
+msgstr "Impinduka zisaba kongera gutangira"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Reka impinduka"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
-msgstr "nyumaho gato"
+msgstr "Nyumaho gato"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Ongera utangire ubu"
 
@@ -981,7 +990,8 @@ msgid "Ok"
 msgstr "Ok"
 
 #: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Version %s"
 msgstr "Verisiyo %s"
 
@@ -1002,7 +1012,7 @@ msgstr "Gumana"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Siba"
@@ -1029,9 +1039,8 @@ msgstr "Sone"
 
 #. TRANS: label for the spiral layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:402
-#, fuzzy
 msgid "Spiral"
-msgstr "Nyamwihinahine"
+msgstr "Spiral"
 
 #. TRANS: label for the box layout in the favorites view
 #: ../src/jarabe/desktop/favoriteslayout.py:472
@@ -1097,26 +1106,33 @@ msgstr "Reba ibyagushimishije"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Ubwoko bw'Urufunguzo:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Ubwoko bwo Kwivuga:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 yihariye"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Umutekano w'umuyoboro udakoresha intsinga:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Subukura"
@@ -1126,12 +1142,12 @@ msgstr "Subukura"
 msgid "Join"
 msgstr "Huza"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Umuyoboro Ad-hoc %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Umuyoboro Mesh %d"
@@ -1156,7 +1172,7 @@ msgstr "%dB"
 
 #: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
-#, python-format, 
+#, python-format,
 msgid "%dKB"
 msgstr "%dKB"
 
@@ -1193,7 +1209,7 @@ msgstr "Sezerera"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr "undi mufatanyije yahagaritse iyohereza ry'ubutumwa"
+msgstr "Undi mufatanyije yahagaritse iyohereza ry'ubutumwa"
 
 #: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
@@ -1217,7 +1233,7 @@ msgstr "Fungura na"
 #: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
-msgstr ""
+msgstr "%s zirengeje"
 
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Neighborhood"
@@ -1304,81 +1320,81 @@ msgid "Tags:"
 msgstr "Tags:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Ikinyamakuru"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Shaka"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Igihe icyo aricyo cyose"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Uyu munsi"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Kuva ejo hashize"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Icyumweru gishize"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Ukwezi gushize"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Umwaka ushize"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Uwo ariwe wese"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Inshuti zanjye"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Ishuri ryanjye"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Icyo aricyo cyose"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "Kopororera ku"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Subiramo"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "Ikosa mu gukoporora icyinzizwa. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1386,24 +1402,24 @@ msgstr "Ikosa"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Tangira"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "Tandukanya uhereye ku itariki byahinduriweho"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "Tandukanya uhereye ku itariki byakorewe"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "Tandukanya uhereye ku ngano"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "Tandukanya ukureba"
 
@@ -1485,7 +1501,7 @@ msgstr "Ibyinjijwe bidafite ububiko ntibishobora kwoherezwa."
 #: ../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 "ibinjijwe bidafite ububiko ntibishobora gukopororwa."
+msgstr "Ibinjijwe bidafite ububiko ntibishobora gukopororwa."
 
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
@@ -1531,38 +1547,38 @@ msgstr "Igikoresho ntikikigenzuwe."
 
 #: ../src/jarabe/model/network.py:171
 msgid "The device could not be readied for configuration."
-msgstr ""
+msgstr "Igikoresho ntikemeye kubonezwa."
 
 #: ../src/jarabe/model/network.py:173
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc)."
-msgstr ""
+msgstr "Iboneza rya IP ntiryabitswe(nta aderese izwi, igihe cyarangiye,...)"
 
 #: ../src/jarabe/model/network.py:176
 msgid "The IP configuration is no longer valid."
-msgstr ""
+msgstr "IP yakoreswaga ntigifite agaciro."
 
 #: ../src/jarabe/model/network.py:178
 msgid "Secrets were required, but not provided."
-msgstr "Amabanga yasabwe, ariko ntiyatanzwe."
+msgstr "Amabanga yarasabwe, ariko ntiyatanzwe."
 
 #: ../src/jarabe/model/network.py:180
 msgid ""
 "The 802.1X supplicant disconnected from the access point or authentication "
 "server."
-msgstr ""
+msgstr "802.1X yavanwe ku murongo wa access point cyangwa kuri seriveri."
 
 #: ../src/jarabe/model/network.py:183
 msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
+msgstr "Gutunganya 802.1X byananiranye."
 
 #: ../src/jarabe/model/network.py:185
 msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
+msgstr "802.1X yavuyeho cyangwa yananiwe bitunguranye."
 
 #: ../src/jarabe/model/network.py:187
 msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
+msgstr "802.1X yafashe igihe kirekire mu kwisobanura"
 
 #: ../src/jarabe/model/network.py:189
 msgid "The PPP service failed to start within the allowed time."
@@ -1630,7 +1646,7 @@ msgstr "Guhamagara byananiranye."
 
 #: ../src/jarabe/model/network.py:222
 msgid "Modem initialization failed."
-msgstr ""
+msgstr "Gutangiza modemu ntibikunze."
 
 #: ../src/jarabe/model/network.py:224
 msgid "Failed to select the specified GSM APN"
@@ -1666,19 +1682,19 @@ msgstr "Igikoresho cyakuweho."
 
 #: ../src/jarabe/model/network.py:240
 msgid "NetworkManager went to sleep."
-msgstr ""
+msgstr "Umugenzuzi w'umuyoboro yashijwe mu businziriro."
 
 #: ../src/jarabe/model/network.py:242
 msgid "The device's active connection was removed or disappeared."
-msgstr ""
+msgstr "Umuyoboro wo kwihuza w'igikoresho wakuweho cyangwa wabuze."
 
 #: ../src/jarabe/model/network.py:245
 msgid "A user or client requested the disconnection."
-msgstr "uwukoresha cyangwa umukiriya yasabwe kwitandukanya ku muyoboro."
+msgstr "Uwukoresha cyangwa umukiriya yasabwe kwitandukanya ku muyoboro."
 
 #: ../src/jarabe/model/network.py:247
 msgid "The device's carrier/link changed."
-msgstr ""
+msgstr "Carrier/link y'igikoresho yahinduwe."
 
 #: ../src/jarabe/view/buddymenu.py:67
 msgid "Remove friend"
@@ -1754,7 +1770,7 @@ msgstr "Inkomoko"
 
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
-msgstr ""
+msgstr "Inkomoko y'ubwibumbe bw'igikorwa"
 
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
@@ -1767,7 +1783,7 @@ msgstr "Reba inkomoko: %r"
 
 #: ../src/jarabe/util/emulator.py:40
 msgid "Sugar in a window"
-msgstr "Sugar mu idirishya"
+msgstr "Sugar mu kadirishya"
 
 # TODO: Add "Start with" menu item
 #~ msgid "Copy"
diff --git a/po/si.po b/po/si.po
index b79252c..d8330db 100644
--- a/po/si.po
+++ b/po/si.po
@@ -18,16 +18,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: 2011-09-02 05:23+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-02-03 09:30+0200\n"
+"Last-Translator: Danishka Navin <danishka@gmail.com>\n"
 "Language-Team: Sinhala <si@li.org>\n"
 "Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
@@ -73,48 +73,48 @@ msgstr "ඔබගේ පාට වෙනස් කිරීමට ක්ලි�
 msgid "About my Computer"
 msgstr "මගේ පරිගණකය ගැන"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "නොපවතී"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "අනන්‍යතාව"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "අනුක්‍රමික අංකය:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "මෘදුකාංගය"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "ගොඩ නැඟුම:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "ස්ථීරාංග:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "රැහැන් රහිත ස්ථිරාංග:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "කතු හිමිකම හා වරපත"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -125,7 +125,7 @@ msgstr ""
 "පොදු බලපත්‍රය මගින් ආවරණය වන නිදහස් මෘදුකාංගයක් වන අතර එහි සඳහන් ඇතැම් "
 "කොන්දේසි වලට යටත්ව මෙය වෙනස් කිරීමට හා/හෝ පිටපත් බෙදාහැරීමට ඔබට හැකිය."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "පූර්ණ බලපත්‍රය:"
 
@@ -457,8 +457,8 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "විසන්ධි කරන්න"
 
@@ -470,18 +470,18 @@ msgstr "විසන්ධි කරන්න"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "සම්බන්ධවෙමින්..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "සම්බන්ධ විය"
 
@@ -510,9 +510,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "සම්බන්ධ වෙන්න"
 
@@ -570,20 +570,20 @@ msgstr "ඔබගේ අංක වින්‍යාසගත කිරීම �
 msgid "Check your configuration."
 msgstr "ඔබගේ වින්‍යාසගත කිරීම පරීක්ෂා කරන්න."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "දැල් ජාලය"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "දැල් ජාලය %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "GSM සම්බන්ධතා නැත."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "පාලක පැනලයේ සම්බන්ධතාවයක් තනන්න."
 
@@ -962,26 +962,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "ඔබගේ වෙනස්කිරීම් බලපෑම සඳහා ෂුගර් යළි ඇරඹිය යුතුය.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "වෙනස්කිරීම සඳහා යළි ඇරඹුමක් අවශ්‍යවේ"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "වෙනස් කිරීම් අවලංගු කරන්න"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "පසුව"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "දැන් යළි ආරම්භ කරන්න"
 
@@ -1020,7 +1020,7 @@ msgstr "තබාගන්න"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "මකන්න"
@@ -1117,26 +1117,33 @@ msgstr "කැමති දසුන"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "යතුරු වර්ගය:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "සත්‍යාපන වර්ගය:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 පෞද්ගලික"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "රැහැන් රහිත ආරක්ෂණය:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "නැවත අරඹන්න"
@@ -1146,12 +1153,12 @@ msgstr "නැවත අරඹන්න"
 msgid "Join"
 msgstr "එකතු වෙන්න"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "%d Ad-hoc ජාලය"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "දැල් ජාලය %d"
@@ -1213,7 +1220,7 @@ msgstr "නිෂ්ප්‍රභ කරනවා"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "අනෙක් සහභාගීවන්නා විසින් ගොනුව හුවමාරුව අවලංගු කරන ලදී"
 
 #: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
@@ -1222,10 +1229,9 @@ msgid "Transfer to %s"
 msgstr "%s ට හුවමාරු කරන්න"
 
 #: ../src/jarabe/frame/clipboardmenu.py:56
-#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
-msgstr "ඉවත් කරන්න"
+msgstr "මකන්න"
 
 #: ../src/jarabe/frame/clipboardmenu.py:62
 #: ../src/jarabe/frame/clipboardmenu.py:85
@@ -1326,81 +1332,81 @@ msgid "Tags:"
 msgstr "හැඳුනුම් වදන්:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "ජ'නලය"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "සෙවිම"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "ඕනෑම වෙලාවක"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "අද"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "ඊයේ සිට"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "පසුගිය සතිය"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "පසුගිය මාසය"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "පසුගිය වසර"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "ඕනෑම අයෙක්"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "මාගේ මිතුරන්"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "මාගේ පන්තිය"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "ඕනෑ දෙයක්"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "වෙත පිටපත් කරන්න"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "අනුපිටපත"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "ප්‍රවේශය පිටපත් කිරීමේදී දෝෂයක්. %s"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1408,24 +1414,24 @@ msgstr "දෝශය"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "ආරම්භ කරන්න"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "විකරණ කල දිනය අනුව සුබෙදන්න"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "තැනුම් දිනය අනුව සුබෙදන්න"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "ප්‍රමාණය අනුව සුබෙදන්න"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "දසුන සුබෙදන්න"
 
@@ -1435,11 +1441,11 @@ msgstr "ඔබගේ ජර්නලය හිස්ය"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
-msgstr ""
+msgstr "ඔබගේ ලියකියවිලි ෆෝල්ඩරය හිස්ය"
 
 #: ../src/jarabe/journal/listview.py:321
 msgid "The device is empty"
-msgstr ""
+msgstr "උපාංගය හිස්ය "
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
@@ -1764,10 +1770,9 @@ msgid "Show contents"
 msgstr "අන්තර්ගතය පෙන්වන්න"
 
 #: ../src/jarabe/view/palettes.py:229
-#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
-msgstr "ඉවත් කරන්න"
+msgstr "මකන්න"
 
 #: ../src/jarabe/view/viewsource.py:263
 msgid "Instance Source"
diff --git a/po/sl.po b/po/sl.po
index 2f2c303..4d673a2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2009-02-28 04:26-0500\n"
 "Last-Translator: Denis Oštir <denis.ostir@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,48 +59,48 @@ msgstr "Klikni za spremembo barve:"
 msgid "About my Computer"
 msgstr "O mojem računalniku"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Ni na voljo"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identiteta"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Serijska številka:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Program"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Različica:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Brezžična oprema:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Lastnik pravic"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -112,7 +112,7 @@ msgstr ""
 "lahko spreminjate in/ali distribuirate, a pod nekaterimi pogoji, zapisanimi "
 "v omenjeni licenci."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Licenčne pravice:"
 
@@ -443,25 +443,25 @@ msgstr "IP naslov: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Prekini"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Povezujem ..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Povezan"
 
@@ -490,9 +490,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Poveži"
 
@@ -530,6 +530,7 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
+#, python-format
 #, python-format, fuzzy
 msgid "%d KB"
 msgstr "%dKB"
@@ -550,20 +551,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Omrežje Mesh"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "Omrežje Mesh"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -939,26 +941,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Za uveljavitev sprememb je potreben ponovni zagon programa sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Sprembe zahtevajo ponovni zagon"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Prekliči spremembe"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Kasneje"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Ponovni zagon"
 
@@ -993,7 +995,7 @@ msgstr "Obdrži"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Izbriši"
@@ -1091,26 +1093,33 @@ msgstr "Priljubljene"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tip ključa:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Tip prepoznave:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA in WPA2 Osebni ključ"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Varovanje brezžičnega omrežja:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Nadaljuj"
@@ -1120,12 +1129,13 @@ msgstr "Nadaljuj"
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "Omrežje Mesh"
@@ -1164,6 +1174,7 @@ msgid "%s of %s"
 msgstr "%s od %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
 #, python-format, fuzzy
 msgid "Transfer from %s"
 msgstr "Prenesi z %r"
@@ -1189,6 +1200,7 @@ msgid "The other participant canceled the file transfer"
 msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
 #, python-format, fuzzy
 msgid "Transfer to %s"
 msgstr "Prenesi na %r"
@@ -1298,81 +1310,81 @@ msgid "Tags:"
 msgstr "Oznake:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Beležka"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Išči"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Danes"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Od včeraj"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "V zadnjem tednu"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "V zadnjem mesecu"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "V zadnjem letu"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Moji prijatelji"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Moj razred"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Karkoli"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1380,24 +1392,24 @@ msgstr ""
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Zaženi"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 0b4b67c..4e71aa6 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2011-11-28 07:22+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,48 +61,48 @@ msgstr "Kliko për ta ndrryshuar ngjyrën:"
 msgid "About my Computer"
 msgstr "Rreth Kompjuterit tim"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Nuk gjindet"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identiteti"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Numri Serik:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Softueri"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Ndërto:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Liqencë me Leje Kopjimi"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -114,7 +114,7 @@ msgstr ""
 "mirëseardhur të ndryshibu atë dhe/ose shpërndani kopje të tij duke "
 "përfillur kushtet e përshkruara në të."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Liqencë e plotë:"
 
@@ -442,24 +442,24 @@ msgstr "IP addresa: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Shkëputu"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Duke u lidhur..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "I lidhur"
 
@@ -488,9 +488,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Lidhu"
 
@@ -529,7 +529,8 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "%d KB"
 msgstr "%d KB"
 
@@ -549,20 +550,20 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -913,26 +914,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Për të aplikuar ndryshimet e juaja ju duhet ta ri-startoni sugarin.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Paralajmërim"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Ndrryshimet kanë nevojë për rinisje"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Anulo ndrryshimet"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Më vonë"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Rinis tani"
 
@@ -967,7 +968,7 @@ msgstr "Mbaje"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Fshije"
@@ -1059,25 +1060,32 @@ msgstr "Shfaq favoritët"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Sigurija e rrjetit pa tela:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Vazhdo"
@@ -1087,12 +1095,12 @@ msgstr "Vazhdo"
 msgid "Join"
 msgstr "Bashkohu"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr ""
@@ -1131,7 +1139,8 @@ msgid "%s of %s"
 msgstr "%s prej %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer from %s"
 msgstr "Transfer nga %s"
 
@@ -1156,7 +1165,8 @@ msgid "The other participant canceled the file transfer"
 msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "Transfer to %s"
 msgstr "Transfer tek %s"
 
@@ -1264,101 +1274,101 @@ msgid "Tags:"
 msgstr "Etiketat:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Ditar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Kërko"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Gjithnjë"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Sot"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Që dje"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Java e kaluar"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Muaji i kaluar"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Viti i kaluar"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Gjithkush"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Shokët e mi"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Klasa ime"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Gjithqka"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Fillo"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 3512401..6726a45 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2010-02-03 22:14+0200\n"
 "Last-Translator: Nicci Manns <nicci@saunalahti.fi>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,48 +62,48 @@ msgstr "Klicka för att ändra din färg:"
 msgid "About my Computer"
 msgstr "Om min dator"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Finns inte tillgänglig"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Serienummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Programvara"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Byggnummer:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sockerversion:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Fast mjukvara:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Trådlös fast mjukvara:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Copyright och Licens"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -114,7 +114,7 @@ msgstr ""
 "är fri programvara och licenserad under GNU GPL vilket innebär att du fritt "
 "får ändra programmet och/eller sprida vidare kopior av programmet."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Detaljerad licens:"
 
@@ -389,6 +389,7 @@ msgid "Download size: %s"
 msgstr "Nedladdningsstorlek: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
+#, python-format
 #, python-format, fuzzy
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr "Frän version %(current)d till %(new)s (Storlek: %(size)s)"
@@ -447,25 +448,25 @@ msgstr "IP-adress: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Avbryt anslutning"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Kopplar upp..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Ansluten"
 
@@ -494,9 +495,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Anslut"
 
@@ -534,6 +535,7 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
+#, python-format
 #, python-format, fuzzy
 msgid "%d KB"
 msgstr "%dKB"
@@ -555,21 +557,22 @@ msgid "Check your configuration."
 msgstr ""
 
 # only temporarily
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Meshnätverk"
 
 # only temporarily
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "Meshnätverk"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -948,26 +951,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "För att förändringarna ska träda i kraft behöver du starta om Socker.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Varning"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Ändringarna kräver omstart"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Ångra ändringar"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Senare"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Starta om nu"
 
@@ -1006,7 +1009,7 @@ msgstr "Spara"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Ta bort"
@@ -1105,27 +1108,34 @@ msgstr "Favoritvy"
 msgid "<Ctrl>1"
 msgstr "<Ctrl> + 1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Huvudtyp:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Verifieringstyp:"
 
 # Uncertain whether Personal here refers to both protocols or WPA2 only.
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Trådlös säkerhet:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Återuppta"
@@ -1135,13 +1145,14 @@ msgstr "Återuppta"
 msgid "Join"
 msgstr "Gå med i"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
 # only temporarily
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "Meshnätverk"
@@ -1181,6 +1192,7 @@ msgid "%s of %s"
 msgstr "%s av %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
+#, python-format
 #, python-format, fuzzy
 msgid "Transfer from %s"
 msgstr "Överföring från %r"
@@ -1206,6 +1218,7 @@ msgid "The other participant canceled the file transfer"
 msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:691
+#, python-format
 #, python-format, fuzzy
 msgid "Transfer to %s"
 msgstr "Överföring till %r"
@@ -1315,81 +1328,81 @@ msgid "Tags:"
 msgstr "Nyckelord:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Dagbok"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Sök"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "När som helst"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Idag"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Sedan igår"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Förra veckan"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Senaste månaden"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Senaste året"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Vem som helst"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Mina vänner"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Mina klasskompisar"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Vad som helst"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1397,24 +1410,24 @@ msgstr ""
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Starta"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/sw.po b/po/sw.po
index 61e7295..a8b6e28 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-11-21 16:06-0500\n"
 "Last-Translator: Fanuel Kalugendo <fanosbert@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,48 +59,48 @@ msgstr "Bofya kwa kubadilisha rangi:"
 msgid "About my Computer"
 msgstr "Kuhusu Kompyuta yangu or kuhusu tarakilishi yangu"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Haipo"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: % (version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Utambulisho"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Serial namba"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Jenga:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sukari:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Firmware"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Wireless Firmware"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Haki miliki na leseni"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -112,7 +112,7 @@ msgstr ""
 "kwa mabadiliko hayo na / au kwa kusambaza nakala yake katika hali fulani "
 "inavyoelezwa humo."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Leseni kamili:"
 
@@ -305,8 +305,9 @@ msgid "Error in automatic pm argument, use on/off."
 msgstr "kosa katika pm automatic hoja , tumiya on / off"
 
 #: ../extensions/cpsection/power/model.py:120
+#, fuzzy
 msgid "Error in extreme pm argument, use on/off."
-msgstr ""
+msgstr "kosa katika pm automatic hoja , tumiya on / off"
 
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
@@ -443,25 +444,25 @@ msgstr "Anwani ya IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Tenganisha"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Inaunganisha..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Imeunganishwa"
 
@@ -490,9 +491,9 @@ msgid "Please wait..."
 msgstr "Tafadhari subiri..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Unganisha"
 
@@ -550,20 +551,20 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -766,12 +767,14 @@ msgid "Jabber Server"
 msgstr ""
 
 #: ../data/sugar.schemas.in.h:35
+#, fuzzy
 msgid "Keyboard layouts"
-msgstr ""
+msgstr "kinanda kuweka"
 
 #: ../data/sugar.schemas.in.h:36
+#, fuzzy
 msgid "Keyboard model"
-msgstr ""
+msgstr "mfano wa kinanda"
 
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
@@ -914,26 +917,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Ili kuweka mabadiliko yako inabidi kuanzisha upya sukari.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Tahadhari"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Mabadiliko yanahitaji kuanzisha upya"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Ghairisha mabadiliko"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Baadae"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Anzisha sasa"
 
@@ -968,7 +971,7 @@ msgstr "Hifadhi"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Futa"
@@ -1061,26 +1064,33 @@ msgstr "Zinazoonwa sana"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Aina ya namba ya siri:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr ""
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Endelea"
@@ -1090,12 +1100,12 @@ msgstr "Endelea"
 msgid "Join"
 msgstr "Ingia/unganisha"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr ""
@@ -1268,101 +1278,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Shajara"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Tafuta"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Leo"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Marafiki yangu"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "Mara mbili"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr "Kosa"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Kuanza"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/ta.po b/po/ta.po
index 0cd5b28..ff2cb1b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,8 +6,8 @@ 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: 2011-09-28 09:35+0200\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2011-10-25 06:50+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ta\n"
@@ -27,11 +27,13 @@ msgstr "நீங்கள் பெயரை பதிவு செய்யு
 
 #: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
+#, python-format,
 msgid "stroke:   color=%s hue=%s"
-msgstr "stroke:   color=%s hue=%s"
+msgstr "stroke:    color=%s hue=%s"
 
 #: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
+#, python-format,
 msgid "stroke:   %s"
 msgstr "stroke:   %s"
 
@@ -55,69 +57,69 @@ msgstr "தவறை குறித்த நிறத்தால் நிற
 
 #: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
-msgstr "நிறத்தை மாற்ற சொடுக்கு்"
+msgstr "நிறத்தை மாற்ற சொடுக்கு்:"
 
 #: ../extensions/cpsection/aboutcomputer/__init__.py:21
 msgid "About my Computer"
 msgstr "என்னுடைய கணினியைப் பற்றி"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
-msgstr "கிடைக்கக்கூடிய வாய்ப்பில்லை."
+msgstr "கிடைக்கக்கூடிய வாய்ப்பில்லை"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "அடையாளம்"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
-msgstr "தொடர் இலக்கம்"
+msgstr "தொடர் இலக்கம்:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "மென்பொருள்"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
-msgstr "கட்டியெழுப்பு"
+msgstr "கட்டியெழுப்பு:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
-msgstr "சுகர்"
+msgstr "சுகர்:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
-msgstr "கூட்டுப்பொருள்"
+msgstr "கூட்டுப்பொருள்:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
-msgstr "இணைப்பில்லாத கூட்டுப்பொருள்"
+msgstr "இணைப்பில்லாத கூட்டுப்பொருள்:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "பிரதிசெய்து உறுதிப்படுத்து"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
 "change it and/or distribute copies of it under certain conditions described "
 "therein."
 msgstr ""
-"சுகர் என்பது பாவனையாளருக்கு பார்த்து தலையீடு செய்வ  தற்கு  சிறப்பாக "
-"அமைக்கப்பட்டுள்ளது.சுகர்  இலவச  மென்பொருளானதோடு,இது GNU  பொது மக்கள் "
+"சுகர் என்பது பாவனையாளருக்கு பார்த்து தலையீடு செய்வ தற்கு  சிறப்பாக "
+"அமைக்கப்பட்டுள்ளது.சுகர் இலவச  மென்பொருளானதோடு,இது GNU பொது மக்கள் "
 "அனுமதியின்கீழ் கையாளப்படுகின்றதை மாற்றுவதற்கோ பிரதிகளை விநியோகிப்பதற்கோ "
 "குறித்த சில நிபந்தனைகளின்கீழ் இதனை மாற்றவோ இதன் பிரதிக ளை விநியோகிக்கவோ "
 "முடியும்."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
-msgstr "முழு அனுமதி"
+msgstr "முழு அனுமதி:"
 
 #: ../extensions/cpsection/datetime/__init__.py:21
 msgid "Date & Time"
@@ -125,7 +127,7 @@ msgstr "திகதியும் நேரமும்"
 
 #: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
-msgstr "தவறு நேர வலையமைப்பு   ஏற்கனவே இல்லை."
+msgstr "தவறு நேர வலையமைப்பு ஏற்கனவே இல்லை."
 
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
@@ -189,17 +191,18 @@ msgstr "மொழி"
 
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "அடையவில்லை~/.i18n. தரமானவற்றை உருவாக்கு"
+msgstr "அடையவில்லை~/.i18n. தரமானவற்றை உருவாக்கு."
 
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
-msgstr "மொழி பரிபாஷை=%s முடிவுசெய்யவில்லை"
+msgstr "மொழி பரிபாஷை=%s முடிவுசெய்யவில்லை."
 
 #: ../extensions/cpsection/language/model.py:152
-#, python-format, fuzzy
+#, python-format
+#, python-format,
 msgid "Sorry I do not speak '%s'."
-msgstr "மன்னிக்கவும் நான் பேசவில்லை"
+msgstr "மன்னிக்கவும் நான் பேசவில்லை இல்லை'%s'."
 
 #: ../extensions/cpsection/language/view.py:57
 msgid ""
@@ -227,7 +230,7 @@ msgstr "எண்:"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
-msgstr "அனுகு புள்ளியின் பெயர் (APN);"
+msgstr "அனுகு புள்ளியின் பெயர் (APN):"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
@@ -252,15 +255,15 @@ msgstr "வலையமைப்பு"
 
 #: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
-msgstr "தரம் அறியப்படாதது"
+msgstr "தரம் அறியப்படாதது."
 
 #: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
-msgstr "குறித்த வானொலி விவாதம்  தவறு.உபயோகியுங்கள்on/off."
+msgstr "குறித்த வானொலி விவாதம் தவறு.உபயோகியுங்கள்on/off."
 
 #: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
-msgstr "குறித்த வானொலி விவாதம்  தவறு..உபயோகியுங்கள்0/1."
+msgstr "குறித்த வானொலி விவாதம் தவறு..உபயோகியுங்கள்0/1."
 
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
@@ -277,12 +280,12 @@ 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 "வலையமைப்பை    துண்டிக்கவும்"
+msgstr "வலையமைப்பை துண்டிக்கவும்"
 
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
@@ -300,7 +303,7 @@ msgstr ""
 
 #: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
-msgstr "வழங்கி"
+msgstr "வழங்கி:"
 
 #: ../extensions/cpsection/power/__init__.py:21
 msgid "Power"
@@ -308,11 +311,11 @@ msgstr "வலு"
 
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
-msgstr "தன்னியக்க pmவிவாதத்தில்  தவறு. உபயோகி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."
+msgstr "கடுமையான pm விவாதம் தவறு . உபயோகி on/off."
 
 #: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
@@ -320,7 +323,7 @@ msgstr "வலு முகாமைத்துவம்"
 
 #: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
-msgstr "தன்னியக்க வலு முகாமைத்துவம் (மின் கலத்தின்  வலுவைக் கூட்டுதல்)."
+msgstr "தன்னியக்க வலு முகாமைத்துவம் (மின் கலத்தின் வலுவைக் கூட்டுதல்)."
 
 #: ../extensions/cpsection/power/view.py:86
 msgid ""
@@ -450,24 +453,24 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 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
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
-msgstr "இணைத்தல்"
+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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "இணைக்கப்பட்டுள்ளது"
 
@@ -496,9 +499,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "இணை"
 
@@ -536,8 +539,8 @@ msgstr "%s க்காக இணைக்கப்பட்டுள்ளத�
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
-#, python-format, 
 #, python-format
+#, python-format,
 msgid "%d KB"
 msgstr "%d KB"
 
@@ -558,20 +561,20 @@ msgstr "எண்னின் அமைப்புகளை பரிசோ�
 msgid "Check your configuration."
 msgstr "உங்களின் அமைப்புகளை பரிசோதிக்கவும்."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "மெஷ் பிணையம்"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "மெஷ் பிணையம் %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "ஜிஎஸ்எம் இணைப்பு இல்லவே இல்லை."
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "கட்டுப்பாடு மட்டத்திலிருந்து ஒரு இணைப்பை உருவாக்கவும்."
 
@@ -581,7 +584,7 @@ msgstr "எனது ஒலி பெருக்கிகள்"
 
 #: ../extensions/deviceicon/speaker.py:138
 msgid "Unmute"
-msgstr "ஒலியை  ஆரம்பி"
+msgstr "ஒலியை ஆரம்பி"
 
 #: ../extensions/deviceicon/speaker.py:141
 msgid "Mute"
@@ -641,7 +644,7 @@ msgstr "அளவுக்கதிகமான அடைவுகள் மே�
 
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
-msgstr "URL ஊடாக  மேலே செல்"
+msgstr "URL ஊடாக மேலே செல்"
 
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
@@ -675,12 +678,12 @@ msgstr "தன்னார்ந்த புனை"
 
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr "மூலையைப் பயன்படுத்துவதனால் சட்டகத்தின் செயற்பாடு தாமதம் அடைகின்றது"
+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"
@@ -700,11 +703,11 @@ msgstr "விருப்பத்துக்குரியதை மீழ �
 
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
-msgstr "திரையினூடாக உட்செல்வதற்கு உபயோகிக்கும் பெயரைப் பயன்படுத்து"
+msgstr "திரையினூடாக உட்செல்வதற்கு உபயோகிக்கும் பெயரைப் பயன்படுத்து."
 
 #: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
-msgstr "திரையினூடாக உட்செல்வதற்கு உபயோகிக்கும் பெயரைப் பயன்படுத்து"
+msgstr "திரையினூடாக உட்செல்வதற்கு உபயோகிக்கும் பெயரைப் பயன்படுத்து."
 
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
@@ -760,7 +763,7 @@ msgid ""
 "server."
 msgstr ""
 "உண்மையாயின் Sugar எங்களை Jabberவழங்கி (கணினி)யின் ஊடக தேடல் நிலைக்கு இட்டுச் "
-"செல்லும்"
+"செல்லும்."
 
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
@@ -798,7 +801,7 @@ msgstr "விசைப்பலகை விருப்பங்கள்"
 
 #: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
-msgstr "விருப்பத்தித்குரிய செயற்பாட்டின் தளக்கோலதின் பார்வை"
+msgstr "விருப்பத்தித்குரிய செயற்பாட்டின் தளக்கோலதின் பார்வை."
 
 #: ../data/sugar.schemas.in.h:39
 msgid ""
@@ -817,7 +820,7 @@ msgstr "தன்னியக்க வலு"
 
 #: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
-msgstr "தன்னியக்க வலு"
+msgstr "தன்னியக்க வலு."
 
 #: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
@@ -825,7 +828,7 @@ msgstr "கூடுதலான வலு"
 
 #: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
-msgstr "கூடுதலான வலு"
+msgstr "கூடுதலான வலு."
 
 #: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
@@ -833,7 +836,7 @@ msgstr "கருவிக்கு வெளிப்படுத்து"
 
 #: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
-msgstr "ஒலித்திட்டமிடலை இல்லாமல் செய்வதற்கான செயற்பாடு"
+msgstr "ஒலித்திட்டமிடலை இல்லாமல் செய்வதற்கான செயற்பாடு."
 
 #: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
@@ -857,15 +860,15 @@ msgstr "இந்த விசைப்பலகை மாதிறி பயன
 
 #: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
-msgstr "நேர வலையமைப்பை செயற்படுத்துவதற்கான அமைப்பு"
+msgstr "நேர வலையமைப்பை செயற்படுத்துவதற்கான அமைப்பு."
 
 #: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
-msgstr "jabber வழங்கி (கணினி)யிலுள்ள Url ஐ உபயோகி"
+msgstr "jabber வழங்கி (கணினி)யிலுள்ள Url ஐ உபயோகி."
 
 #: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
-msgstr "Url எதனுள் சேமிக்கப்பட்டுள்ளது"
+msgstr "Url எதனுள் சேமிக்கப்பட்டுள்ளது."
 
 #: ../data/sugar.schemas.in.h:56
 msgid "User Color"
@@ -877,15 +880,14 @@ msgstr "உபயோகிப்பவரின் பெயர்"
 
 #: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
-msgstr ""
-"திரையினுாடாக உட்செல்வதற்கு                உபயோகிக்கும் பெயரைப் பயன்படுத்து"
+msgstr "திரையினுாடாக உட்செல்வதற்கு உபயோகிக்கும் பெயரைப் பயன்படுத்து."
 
 #: ../data/sugar.schemas.in.h:59
 msgid ""
 "Users will not be allowed to erase these activities through the list view."
 msgstr ""
 "பட்டியல் பார்வை மூலமாக இந்த செயற்பாடுகளை அழிக்க பயனாளர்கள் அனுமதிக்க "
-"படமாட்டார்"
+"படமாட்டார்."
 
 #: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
@@ -893,7 +895,7 @@ msgstr "சத்தத்தின் அளவு"
 
 #: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
-msgstr "ஒலிஉபகரணத்திற்கான சத்தத்தின் அளவு"
+msgstr "ஒலிஉபகரணத்திற்கான சத்தத்தின் அளவு."
 
 #: ../data/sugar.schemas.in.h:62
 msgid ""
@@ -901,7 +903,7 @@ msgid ""
 "for that activity to be resumed."
 msgstr ""
 "மீழ ஆரம்பிப்பதற்கு விரும்பிய icon மீது அழுத்தியவுடன் இறுதியாக செய்த "
-"செயற்பாடுகளைப் பெற்றுக் கொள்ளலாம்"
+"செயற்பாடுகளைப் பெற்றுக் கொள்ளலாம்."
 
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
@@ -945,33 +947,33 @@ msgstr ""
 "-------hசாவி----இந்த சாவிக்கான தகவலைக் காட்டு\n"
 "------g சாவி---- தற்போதைய சாவிக்கான பெறுமதியினைப் பெற்றுக்கொள்\n"
 "-----s சாவி------ தற்போதைய சாவிக்கான பெறுமதியினை ஒழுங்குபடுத்து \n"
-"------c சாவி----- தற்போதைய சாவிக்கான பெறுமதியினை நீக்கு\n"
-"------"
+"------c சாவி----- தற்போதைய சாவிக்கான பெறுமதியினை நீக்கு \n"
+"    "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
-msgstr "உங்களுடைய மாற்றங்களைப் பதிவதற்கு சுகரை மீள் ஆரம்பி\n"
+msgstr "உங்களுடைய மாற்றங்களைப் பதிவதற்கு சுகரை மீள் ஆரம்பி.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "மாற்றத்தினை மீள் ஆரம்பிப்பதற்கான கோரிக்கை"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "மாற்றத்தினை இரத்துசெய்"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "பின்னர்"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "இப்போது மீள் ஆரம்பி"
 
@@ -985,9 +987,10 @@ msgid "Ok"
 msgstr "சரி"
 
 #: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format, fuzzy
+#, python-format
+#, python-format,
 msgid "Version %s"
-msgstr "பதிப்பு %கள்"
+msgstr "பதிப்புகள் %s"
 
 #: ../src/jarabe/desktop/activitieslist.py:356
 msgid "Confirm erase"
@@ -1006,7 +1009,7 @@ msgstr "வைத்திரு"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "அழி"
@@ -1061,7 +1064,7 @@ msgstr "பதிவு வெற்றிகரமானது"
 msgid "You are now registered with your school server."
 msgstr ""
 "நீங்கள் தற்போது உங்கள் பாடசாலையிலுள்ள வழங்கி (கணினி) யில் பதிவு "
-"செய்யப்பட்டுள்ளீர்"
+"செய்யப்பட்டுள்ளீர்."
 
 #: ../src/jarabe/desktop/favoritesview.py:641
 msgid "Register"
@@ -1100,25 +1103,32 @@ msgstr "விருப்புக்குரிய பார்வை"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
-msgstr "சாவி டைப்/வகை"
+msgstr "சாவி டைப்/வகை:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
-msgstr "நம்பத்தகுந்த டைப்/வகை"
+msgstr "நம்பத்தகுந்த டைப்/வகை:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 தனிப்பட்ட"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
-msgstr "இணைப்பற்ற பாதுகாப்பு"
+msgstr "இணைப்பற்ற பாதுகாப்பு:"
 
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "மீழ ஆரம்பி"
@@ -1128,23 +1138,23 @@ msgstr "மீழ ஆரம்பி"
 msgid "Join"
 msgstr "இணை"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Ad-hoc பிணையம் %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "மெஷ் பிணையம் %d"
 
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
-msgstr "வழங்கி (கணினி) யினை இணைக்க முடியாது"
+msgstr "வழங்கி (கணினி) யினை இணைக்க முடியாது."
 
 #: ../src/jarabe/desktop/schoolserver.py:150
 msgid "The server could not complete the request."
-msgstr "வழங்கி (கணினி) கட்டளையை முழுமையாக ஏற்கவில்லை"
+msgstr "வழங்கி (கணினி) கட்டளையை முழுமையாக ஏற்கவில்லை."
 
 #: ../src/jarabe/frame/activitiestray.py:187
 #: ../src/jarabe/frame/activitiestray.py:574
@@ -1168,11 +1178,11 @@ msgstr "%dMB"
 
 #: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
+#, python-format,
 msgid "%s of %s"
-msgstr "%s of %s"
+msgstr "%s இல் %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, 
 #, python-format
 #, python-format,
 msgid "Transfer from %s"
@@ -1196,17 +1206,15 @@ msgstr "இல்லாமல் செய்"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "கோப்பு பதிவேற்றத்தை மற்ற இணைப்பாளர் இரத்துசெய்து விட்டார்"
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, 
 #, python-format
 #, python-format,
 msgid "Transfer to %s"
 msgstr "%s க்கு மாற்றம் செய்"
 
 #: ../src/jarabe/frame/clipboardmenu.py:56
-#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
 msgstr "அகற்று"
@@ -1247,11 +1255,11 @@ msgstr "F4"
 
 #: ../src/jarabe/intro/window.py:90
 msgid "Name:"
-msgstr "பெயர்"
+msgstr "பெயர்:"
 
 #: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
-msgstr "நிற மாற்றத்திற்காக அழுத்து"
+msgstr "நிற மாற்றத்திற்காக அழுத்து:"
 
 #: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
@@ -1299,112 +1307,112 @@ msgstr "திகதியில்லை"
 
 #: ../src/jarabe/journal/expandedentry.py:301
 msgid "Participants:"
-msgstr "பங்குபற்றுநர்"
+msgstr "பங்குபற்றுநர்:"
 
 #: ../src/jarabe/journal/expandedentry.py:323
 msgid "Description:"
-msgstr "விளக்கம்"
+msgstr "விளக்கம்:"
 
 #: ../src/jarabe/journal/expandedentry.py:348
 msgid "Tags:"
-msgstr "இணைக்கயிறு"
+msgstr "இணைக்கயிறு:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "சஞ்சிகை"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "தேடு"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "எந்நேரம்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "இன்று"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "நேற்று வரை"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "கடந்த வாரம்"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "கடந்த மாதம்"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "கடந்த வருடம்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "யாராவது"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "எனது நண்பர்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "எனது வகுப்பு"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "ஏதாவது"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "க்கு பிரதி செய்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "நகல்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "இருப்பதை %s பிரதி செய்யும்பொழுது பிழை"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr "தவறு"
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "ஆரம்பி"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "மாற்றப்பற்ற திகதிகளின்படி வைக்கவும்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "உருவாக்கப்பட்ட திகதிகளின்படி வைக்கவும்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "அளவுகளின் படி வைக்கவும்"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "வைப்பு பார்வை"
 
@@ -1414,11 +1422,11 @@ msgstr "உங்களுடைய சஞ்சிகை வெறுமைய�
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
-msgstr ""
+msgstr "உங்களுடைய ஆவணஅடைவு ஆனது காலியாக உள்ளது"
 
 #: ../src/jarabe/journal/listview.py:321
 msgid "The device is empty"
-msgstr ""
+msgstr "கருவி காலியாகவுள்ளது"
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
@@ -1426,7 +1434,7 @@ msgstr "பொருத்தமற்றப் பதிவுகள்"
 
 #: ../src/jarabe/journal/listview.py:397
 msgid "Clear search"
-msgstr "தேடலை  நீக்கு"
+msgstr "தேடலை நீக்கு"
 
 #: ../src/jarabe/journal/misc.py:273
 #, python-format
@@ -1444,7 +1452,7 @@ msgstr "உங்கள் சஞ்சிகை நிரம்புயுள�
 
 #: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
-msgstr "தயவு செய்து புதிய தகவல்களைப் பதிவதற்காக சில பழைய தகவல்களை அழிக்கவும்"
+msgstr "தயவு செய்து புதிய தகவல்களைப் பதிவதற்காக சில பழைய தகவல்களை அழிக்கவும்."
 
 #: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
@@ -1486,7 +1494,7 @@ 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 "இருக்கின்றவையில் கோப்பில்லாதவைகளை பிரதி செய்ய  முடியாது."
+msgstr "இருக்கின்றவையில் கோப்பில்லாதவைகளை பிரதி செய்ய முடியாது."
 
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
@@ -1520,7 +1528,7 @@ msgstr "கருவியின் நிலை மாற்றமாற்ற�
 
 #: ../src/jarabe/model/network.py:165
 msgid "The state change is normal."
-msgstr "நிலைமாற்றம் சரியாக உள்ளது"
+msgstr "நிலைமாற்றம் சரியாக உள்ளது."
 
 #: ../src/jarabe/model/network.py:167
 msgid "The device is now managed."
@@ -1528,11 +1536,11 @@ msgstr "கருவியானது மேலாண்மை செய்ய�
 
 #: ../src/jarabe/model/network.py:169
 msgid "The device is no longer managed."
-msgstr "கருவியானது இனிமேலும் மேலாண்மை செய்யப்படமாட்டாது"
+msgstr "கருவியானது இனிமேலும் மேலாண்மை செய்யப்படமாட்டாது."
 
 #: ../src/jarabe/model/network.py:171
 msgid "The device could not be readied for configuration."
-msgstr "கருவியின் அமைப்புகளை படிக்க முடியவில்லை"
+msgstr "கருவியின் அமைப்புகளை படிக்க முடியவில்லை."
 
 #: ../src/jarabe/model/network.py:173
 msgid ""
@@ -1563,7 +1571,7 @@ msgstr "802.1x ஏற்ப்பியின் அமைப்புகள்
 
 #: ../src/jarabe/model/network.py:185
 msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr "802.1x ஏற்ப்பியினாது எதிர்பாராமல் தோழ்வியுற்றது (அ) வெளியேறிவிட்டது"
+msgstr "802.1x ஏற்ப்பியினாது எதிர்பாராமல் தோழ்வியுற்றது (அ) வெளியேறிவிட்டது."
 
 #: ../src/jarabe/model/network.py:187
 msgid "The 802.1X supplicant took too long to authenticate."
@@ -1613,7 +1621,7 @@ msgstr "தானியக்க IP சேவை எதிர்பாராத
 
 #: ../src/jarabe/model/network.py:210
 msgid "The AutoIP service quit or failed unexpectedly."
-msgstr "தானியக்க IP சேவை எதிர்பாராமல் தோழ்வியுற்றது (அ) வெளியேறிவிட்டது"
+msgstr "தானியக்க IP சேவை எதிர்பாராமல் தோழ்வியுற்றது (அ) வெளியேறிவிட்டது."
 
 #: ../src/jarabe/model/network.py:212
 msgid "Dialing failed because the line was busy."
@@ -1723,7 +1731,7 @@ msgstr "<b>%s</b> ஆரம்பமானது தோழ்வியுற�
 
 #: ../src/jarabe/view/palettes.py:48
 msgid "Starting..."
-msgstr "ஆரம்பி"
+msgstr "ஆரம்பி..."
 
 #: ../src/jarabe/view/palettes.py:58
 msgid "Activity failed to start"
@@ -1744,10 +1752,9 @@ msgstr "புதிதை ஆரம்பி"
 
 #: ../src/jarabe/view/palettes.py:180
 msgid "Show contents"
-msgstr "உள்ளடக்கியதைக்  காட்டு"
+msgstr "உள்ளடக்கியதைக் காட்டு"
 
 #: ../src/jarabe/view/palettes.py:229
-#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
 msgstr "அகற்று"
@@ -1762,7 +1769,7 @@ msgstr "வளம் (மூலம்)"
 
 #: ../src/jarabe/view/viewsource.py:374
 msgid "Activity Bundle Source"
-msgstr "செயற்பாட்டு  வளத் (மூலம்) தொகுதி"
+msgstr "செயற்பாட்டு வளத் (மூலம்) தொகுதி"
 
 #: ../src/jarabe/view/viewsource.py:393
 msgid "Sugar Toolkit Source"
diff --git a/po/te.po b/po/te.po
index 15e14b7..c901c03 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,8 +6,8 @@ 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: 2011-11-27 01:19+0200\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2011-11-27 06:14+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: te\n"
@@ -62,48 +62,48 @@ msgstr "రంగు మార్చడానికి నొక్కు"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "అలభ్యం"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "ఉనికి"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "వరుస సంఖ్య:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "సాఫ్ట్​వేర్"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "బిల్డ్:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "ఫర్మ్​వేర్:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -111,7 +111,7 @@ msgid ""
 "therein."
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr ""
 
@@ -187,7 +187,7 @@ msgstr "భాష"
 #: ../extensions/cpsection/language/model.py:30
 #, fuzzy
 msgid "Could not access ~/.i18n. Create standard settings."
-msgstr " ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
+msgstr "ప్రవేశము కుదరలేదు. ప్రమాణ మైన సెట్టింగ్ శ్రుష్తించనా."
 
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
@@ -295,7 +295,7 @@ msgstr "శెర్వరు:"
 
 #: ../extensions/cpsection/power/__init__.py:21
 msgid "Power"
-msgstr "విద్యుత్తు "
+msgstr "విద్యుత్తు"
 
 #: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
@@ -440,8 +440,8 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 #, fuzzy
 msgid "Disconnect"
 msgstr "వేరుచేయబడింది"
@@ -452,18 +452,18 @@ msgstr "వేరుచేయబడింది"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 #, fuzzy
 msgid "Connecting..."
 msgstr "వేరుచేయి . . ."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "తగిలించబడినది"
 
@@ -492,9 +492,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "తగిలించు"
 
@@ -552,20 +552,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "మెష్ వల"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "మెష్ వల %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -595,7 +596,7 @@ msgstr ""
 
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
-msgstr "మెష్ వల "
+msgstr "మెష్ వల"
 
 #: ../extensions/globalkey/screenshot.py:61
 #: ../src/jarabe/frame/zoomtoolbar.py:41
@@ -919,26 +920,26 @@ msgstr "షుగర్-కంట్రోల్-పేనల్:"
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "మీ మార్పులు పనిచేయడానికి సుగరును తిరిగి మొదలు పెట్టండి.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "మార్పులు తిరిగి మొదలుపెట్తినతర్వాతే పనిచేస్తాయి"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "మార్పులు రద్దుచేయి"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "తరవాత"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "ఇప్పుడు మరలామొదలుపెట్టు"
 
@@ -977,7 +978,7 @@ msgstr "ఉంచు"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "చెరిపివేయి"
@@ -1071,25 +1072,32 @@ msgstr "ఇష్టమైనవి చూచుటకు"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>L"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "తాళం రకము:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "దృడపరచుకొనే రకము:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "పునరారంభించు"
@@ -1099,12 +1107,13 @@ msgstr "పునరారంభించు"
 msgid "Join"
 msgstr "కలువు"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "మెష్ వల %d"
@@ -1277,101 +1286,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "మొదలుపెట్టు"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/templates.po b/po/templates.po
deleted file mode 100644
index 8151467..0000000
--- a/po/templates.po
+++ /dev/null
@@ -1,1713 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
-
-#: ../extensions/cpsection/aboutme/__init__.py:24
-msgid "About Me"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:48
-msgid "You must enter a name."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:75
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:78
-#, python-format
-msgid "stroke:   %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:80
-#, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:82
-#, python-format
-msgid "fill:     %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:94
-msgid "Error in specified color modifiers."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:97
-msgid "Error in specified colors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:235
-msgid "Click to change your color:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/__init__.py:21
-msgid "About my Computer"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:42
-msgid "Not available"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:171
-#, python-format
-msgid "%(interface)s: %(version)s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:61
-msgid "Identity"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:70
-msgid "Serial Number:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:92
-msgid "Software"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:101
-msgid "Build:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:116
-msgid "Sugar:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:132
-msgid "Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:147
-msgid "Wireless Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:170
-msgid "Copyright and License"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:188
-msgid ""
-"Sugar is the graphical user interface that you are looking at. Sugar is free "
-"software, covered by the GNU General Public License, and you are welcome to "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:200
-msgid "Full license:"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/model.py:92
-msgid "Error timezone does not exist."
-msgstr ""
-
-#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
-msgid "Timezone"
-msgstr ""
-
-#: ../extensions/cpsection/frame/__init__.py:21
-msgid "Frame"
-msgstr ""
-
-#: ../extensions/cpsection/frame/model.py:41
-#: ../extensions/cpsection/frame/model.py:66
-msgid "Value must be an integer."
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:27
-msgid "never"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:28
-msgid "instantaneous"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:29
-#, python-format
-msgid "%s seconds"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:54
-msgid "Activation Delay"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:78
-msgid "Corner"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:113
-msgid "Edge"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:32
-msgid "Keyboard"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:190
-msgid "Keyboard Model"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:250
-msgid "Key(s) to change layout"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:319
-msgid "Keyboard Layout(s)"
-msgstr ""
-
-#: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:33
-msgid "Language"
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:30
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:129
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:152
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr ""
-
-#: ../extensions/cpsection/language/view.py:57
-msgid ""
-"Add languages in the order you prefer. If a translation is not available, "
-"the next in the list will be used."
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/__init__.py:21
-msgid "Modem Configuration"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:94
-msgid "Username:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:106
-msgid "Password:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:118
-msgid "Number:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:130
-msgid "Access Point Name (APN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:142
-msgid "Personal Identity Number (PIN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:154
-msgid "Personal Unblocking Key (PUK):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:175
-msgid ""
-"You will need to provide the following information to set up a mobile "
-"broadband connection to a cellular (3G) network."
-msgstr ""
-
-#: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:29
-msgid "Network"
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:71
-msgid "State is unknown."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:99
-msgid "Error in specified radio argument use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:140
-msgid "Error in specified argument use 0/1."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:61
-msgid "Wireless"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:69
-msgid "Turn off the wireless radio to save battery life"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:82
-msgid "Radio"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:98
-msgid "Discard network history if you have trouble connecting to the network"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:107
-msgid "Discard network history"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:122
-msgid "Collaboration"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:130
-msgid ""
-"The server is the equivalent of what room you are in; people on the same "
-"server will be able to see each other, even when they aren't on the same "
-"network."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:140
-msgid "Server:"
-msgstr ""
-
-#: ../extensions/cpsection/power/__init__.py:21
-msgid "Power"
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:90
-msgid "Error in automatic pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:120
-msgid "Error in extreme pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:48
-msgid "Power management"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:58
-msgid "Automatic power management (increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:86
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/updater/__init__.py:21
-msgid "Software update"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:63
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities, and "
-"provide new features."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:125
-#, python-format
-msgid "Checking %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:127
-#, python-format
-msgid "Downloading %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:129
-#, python-format
-msgid "Updating %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:139
-msgid "Your software is up-to-date"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:141
-#, python-format
-msgid "You can install %s update"
-msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:159
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:164
-msgid "Installing updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:173
-#, python-format
-msgid "%s update was installed"
-msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:255
-msgid "Install selected"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:276
-#, python-format
-msgid "Download size: %s"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:364
-#, python-format
-msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
-
-#. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:382
-msgid "None"
-msgstr ""
-
-#. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:385
-msgid "1 KB"
-msgstr ""
-
-#. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:388
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:391
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:71
-msgid "My Battery"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:147
-msgid "Removed"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:150
-msgid "Charging"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:153
-msgid "Very little power remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:158
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:161
-msgid "Charged"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:49
-#, python-format
-msgid "IP address: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:104
-#: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
-msgid "Disconnect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:112
-#: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
-msgid "Connecting..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:117
-#: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
-msgid "Connected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:130
-msgid "No wireless connection"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:144
-msgid "Channel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:159
-msgid "Wired Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:188
-msgid "Speed"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:213
-msgid "Wireless modem"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:281
-msgid "Please wait..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
-msgid "Connect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:287
-msgid "Disconnected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:294
-#: ../src/jarabe/controlpanel/toolbar.py:119
-#: ../src/jarabe/desktop/homebox.py:71
-#: ../src/jarabe/frame/activitiestray.py:602
-#: ../src/jarabe/frame/activitiestray.py:704
-#: ../src/jarabe/frame/activitiestray.py:732
-msgid "Cancel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:333
-msgid "Try connection again"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:336
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:340
-#, python-format
-msgid "Suggestion: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:349
-#, python-format
-msgid "Connected for %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:355
-#: ../extensions/deviceicon/network.py:356
-#, python-format
-msgid "%d KB"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:361
-msgid "Check your Pin/Puk configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:364
-msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:368
-msgid "Check the Number configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:370
-msgid "Check your configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:612
-msgid "Mesh Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:656
-#, python-format
-msgid "Mesh Network %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:779
-msgid "No GSM connection available."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:780
-msgid "Create a connection in the control panel."
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:61
-msgid "My Speakers"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:138
-msgid "Unmute"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:141
-msgid "Mute"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:38
-msgid "finger"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:39
-msgid "stylus"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:68
-msgid "My touchpad"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:59
-msgid "Mesh"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "Group"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "Home"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "Activity"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:72
-msgid "Screenshot"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:74
-#, python-format
-msgid "Screenshot of \"%s\""
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:1
-msgid ""
-"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
-"long name."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:2
-msgid "Additional directories which can contain updated translations."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:3
-msgid "Backup URL"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:4
-msgid "Bundle IDs of protected activities"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:5
-msgid ""
-"Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rgb colors. "
-"Example: #AC32FF,#9A5200"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:6
-msgid "Corner Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:7
-msgid "Default font face"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:8
-msgid "Default font size"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:9
-msgid "Default nick"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:10
-msgid "Delay for the activation of the frame using the corners."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:11
-msgid "Delay for the activation of the frame using the edges."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:12
-msgid "Directory to search for translations"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:13
-msgid "Edge Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:14
-msgid "Favorites Layout"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:15
-msgid "Favorites resume mode"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:16
-msgid "Font face that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:17
-msgid "Font size that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:18
-msgid "GSM network APN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:19
-msgid "GSM network PIN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:20
-msgid "GSM network PUK"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:21
-msgid "GSM network access point name configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:22
-msgid "GSM network number"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:23
-msgid "GSM network password"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:24
-msgid "GSM network password configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:25
-msgid "GSM network personal identification number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:26
-msgid "GSM network personal unlock key configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:27
-msgid "GSM network telephone number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:28
-msgid "GSM network username"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:29
-msgid "GSM network username configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:30
-msgid ""
-"If TRUE, Sugar will make us searchable for the other users of the Jabber "
-"server."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:31
-msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:32
-msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:33
-msgid ""
-"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
-"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
-"hoc network."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:34
-msgid "Jabber Server"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:35
-msgid "Keyboard layouts"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:36
-msgid "Keyboard model"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:37
-msgid "Keyboard options"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:38
-msgid "Layout of the favorites view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:39
-msgid ""
-"List of keyboard layouts. Each entry should be in the form layout(variant)"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:40
-msgid "List of keyboard options."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:41
-msgid "Power Automatic"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:42
-msgid "Power Automatic."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:43
-msgid "Power Extreme"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:44
-msgid "Power Extreme."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:45
-msgid "Publish to Gadget"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:46
-msgid "Setting for muting the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:47
-msgid "Show Log out"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:48
-msgid "Show Restart"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:49
-msgid "Show Sugar Ad-hoc networks"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:50
-msgid "Sound Muted"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:51
-msgid "The keyboard model to be used"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:53
-msgid "Timezone setting for the system."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:54
-msgid "Url of the jabber server to use."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:55
-msgid "Url where the backup is saved to."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:56
-msgid "User Color"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:57
-msgid "User Name"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:58
-msgid "User name that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:59
-msgid ""
-"Users will not be allowed to erase these activities through the list view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:60
-msgid "Volume Level"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:61
-msgid "Volume level for the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:62
-msgid ""
-"When in resume mode, clicking on a favorite icon will cause the last entry "
-"for that activity to be resumed."
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:28
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:30
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:31
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr ""
-
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:38
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:52
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
-#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
-#: ../src/jarabe/journal/volumestoolbar.py:307
-msgid "Warning"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:297
-#: ../src/jarabe/controlpanel/sectionview.py:41
-msgid "Changes require restart"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:300
-msgid "Cancel changes"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
-msgid "Later"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:309
-msgid "Restart now"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
-msgid "Done"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:125
-#: ../src/jarabe/desktop/favoritesview.py:347
-msgid "Ok"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format
-msgid "Version %s"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:356
-msgid "Confirm erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:358
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:362
-#: ../src/jarabe/frame/clipboardmenu.py:67
-#: ../src/jarabe/view/viewsource.py:280
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:365
-#: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
-#: ../src/jarabe/journal/palettes.py:126
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:435
-msgid "Remove favorite"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:439
-msgid "Make favorite"
-msgstr ""
-
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:127
-msgid "Freeform"
-msgstr ""
-
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:215
-msgid "Ring"
-msgstr ""
-
-#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:402
-msgid "Spiral"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:472
-msgid "Box"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:515
-msgid "Triangle"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:338
-msgid "Registration Failed"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:339
-#, python-format
-msgid "%s"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:341
-msgid "Registration Successful"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:342
-msgid "You are now registered with your school server."
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:641
-msgid "Register"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:643
-#: ../src/jarabe/desktop/favoritesview.py:660
-msgid "Register again"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:66
-msgid "Software Update"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-msgid "Check now"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:197
-msgid "List view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:198
-msgid "<Ctrl>2"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:253
-msgid "Favorites view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:254
-msgid "<Ctrl>1"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:143
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:163
-msgid "Authentication Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:229
-msgid "WPA & WPA2 Personal"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:238
-msgid "Wireless Security:"
-msgstr ""
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
-#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
-msgid "Resume"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:96
-#: ../src/jarabe/frame/activitiestray.py:182
-msgid "Join"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:500
-#, python-format
-msgid "Ad-hoc Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format
-msgid "Mesh Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:143
-msgid "Cannot connect to the server."
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:150
-msgid "The server could not complete the request."
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:187
-#: ../src/jarabe/frame/activitiestray.py:574
-msgid "Decline"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:523
-#, python-format
-msgid "%dB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:525
-#, python-format
-msgid "%dKB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:527
-#, python-format
-msgid "%dMB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:544
-#, python-format
-msgid "%s of %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:558
-#, python-format
-msgid "Transfer from %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:569
-msgid "Accept"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:592
-#: ../src/jarabe/frame/activitiestray.py:722
-#, python-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:626
-#: ../src/jarabe/frame/activitiestray.py:639
-#: ../src/jarabe/frame/activitiestray.py:757
-msgid "Dismiss"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:643
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:691
-#, python-format
-msgid "Transfer to %s"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:56
-msgctxt "Clipboard"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/frame/clipboardmenu.py:85
-msgid "Open"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:90
-msgid "Open with"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardobject.py:50
-#, python-format
-msgid "%s clipping"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "Neighborhood"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "F1"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "F2"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "F3"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "F4"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:90
-msgid "Name:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:126
-msgid "Click to change color:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
-msgid "Back"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:204
-msgid "Next"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:156
-#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
-#: ../src/jarabe/journal/volumestoolbar.py:130
-msgid "Untitled"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:245
-msgid "No preview"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#, python-format
-msgid "Kind: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#: ../src/jarabe/journal/listmodel.py:150
-#: ../src/jarabe/journal/listmodel.py:158
-msgid "Unknown"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:265
-#, python-format
-msgid "Date: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:266
-#, python-format
-msgid "Size: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:294
-#: ../src/jarabe/journal/misc.py:108
-msgid "No date"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:301
-msgid "Participants:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:323
-msgid "Description:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:348
-msgid "Tags:"
-msgstr ""
-
-#: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
-#: ../src/jarabe/journal/palettes.py:198
-#: ../src/jarabe/journal/volumestoolbar.py:368
-msgid "Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:71
-msgid "Search"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:138
-msgid "Anytime"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:140
-msgid "Today"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:142
-msgid "Since yesterday"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
-msgid "Past week"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
-msgid "Past month"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
-msgid "Past year"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:155
-msgid "Anyone"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:157
-msgid "My friends"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:158
-msgid "My class"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:300
-msgid "Anything"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:381
-#: ../src/jarabe/journal/palettes.py:93
-msgid "Copy to"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:389
-#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:422
-#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
-#: ../src/jarabe/journal/volumestoolbar.py:315
-#, python-format
-msgid "Error while copying the entry. %s"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:423
-#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
-#: ../src/jarabe/journal/volumestoolbar.py:316
-msgid "Error"
-msgstr ""
-
-#. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
-#: ../src/jarabe/journal/palettes.py:74
-msgid "Start"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:525
-msgid "Sort by date modified"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:526
-msgid "Sort by date created"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:527
-msgid "Sort by size"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:536
-msgid "Sort view"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:316
-msgid "Your Journal is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:319
-msgid "Your documents folder is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:321
-msgid "The device is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:323
-msgid "No matching entries"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:397
-msgid "Clear search"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:273
-#, python-format
-msgid "Older Version Of %s Activity"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:274
-#, python-format
-msgid "Do you want to downgrade to version %s"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:64
-msgid "Your Journal is full"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:68
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:80
-msgid "Show Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:146
-msgid "Choose an object"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:410
-msgid "Close"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:72
-msgid "Resume with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:75
-msgid "Start with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
-msgid "No activity to start entry"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:112
-msgid "Send to"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:121
-msgid "View Details"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:160
-msgid "Entries without a file cannot be sent."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
-#: ../src/jarabe/journal/volumestoolbar.py:306
-msgid "Entries without a file cannot be copied."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:267
-msgid "Clipboard"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:322
-msgid "No friends present"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:327
-msgid "No valid connection found"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:355
-msgid "No activity to resume entry"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:209
-msgid "Documents"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:391
-#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:163
-msgid "The reason for the device state change is unknown."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:165
-msgid "The state change is normal."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:167
-msgid "The device is now managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:169
-msgid "The device is no longer managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:171
-msgid "The device could not be readied for configuration."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:173
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:176
-msgid "The IP configuration is no longer valid."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:178
-msgid "Secrets were required, but not provided."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:180
-msgid ""
-"The 802.1X supplicant disconnected from the access point or authentication "
-"server."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:183
-msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:185
-msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:187
-msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:189
-msgid "The PPP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:191
-msgid "The PPP service disconnected unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:193
-msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:195
-msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:197
-msgid "The DHCP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:199
-msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:201
-msgid "The shared connection service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:203
-msgid "The shared connection service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:206
-msgid "The AutoIP service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:208
-msgid "The AutoIP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:210
-msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:212
-msgid "Dialing failed because the line was busy."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:214
-msgid "Dialing failed because there was no dial tone."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:216
-msgid "Dialing failed because there was no carrier."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:218
-msgid "Dialing timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:220
-msgid "Dialing failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:222
-msgid "Modem initialization failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:224
-msgid "Failed to select the specified GSM APN"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:226
-msgid "Not searching for networks."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:228
-msgid "Network registration was denied."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:230
-msgid "Network registration timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:232
-msgid "Failed to register with the requested GSM network."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:234
-msgid "PIN check failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:236
-msgid "Necessary firmware for the device may be missing."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:238
-msgid "The device was removed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:240
-msgid "NetworkManager went to sleep."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:242
-msgid "The device's active connection was removed or disappeared."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:245
-msgid "A user or client requested the disconnection."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:247
-msgid "The device's carrier/link changed."
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:67
-msgid "Remove friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:70
-msgid "Make friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:87
-msgid "Shutdown"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:95
-msgid "Restart"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:101
-msgid "Logout"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:106
-msgid "My Settings"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:142
-#, python-format
-msgid "Invite to %s"
-msgstr ""
-
-#: ../src/jarabe/view/launcher.py:145
-#, python-format
-msgid "<b>%s</b> failed to start."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:48
-msgid "Starting..."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:58
-msgid "Activity failed to start"
-msgstr ""
-
-#. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:91
-msgid "View Source"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:102
-msgid "Stop"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:139
-msgid "Start new"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:180
-msgid "Show contents"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:229
-msgctxt "Volume"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:263
-msgid "Instance Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:312
-msgid "Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:374
-msgid "Activity Bundle Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:393
-msgid "Sugar Toolkit Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
-#, python-format
-msgid "View source: %r"
-msgstr ""
-
-#: ../src/jarabe/util/emulator.py:40
-msgid "Sugar in a window"
-msgstr ""
diff --git a/po/th.po b/po/th.po
index fb43621..c806b38 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2012-04-01 06:36+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -433,29 +433,30 @@ msgid "Charged"
 msgstr "ประจุไฟแล้ว"
 
 #: ../extensions/deviceicon/network.py:49
-#, python-format, 
+#, python-format
+#, python-format,
 msgid "IP address: %s"
 msgstr "IP address: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "ตัดการเชื่อมต่อ"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "เชื่อมต่อแล้ว"
@@ -485,8 +486,8 @@ msgid "Please wait..."
 msgstr "กรุณารอสักครู่..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "เชื่อมต่อ"
@@ -545,20 +546,20 @@ msgstr "ตรวจสอบการตั้งหมายเลข"
 msgid "Check your configuration."
 msgstr "ตรวจสอบการตั้งค่าของคุณ"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "เครือข่ายตาข่าย"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "เครือข่ายตาข่าย %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "ไม่มีการเชื่อมต่อระบบ GSM ที่ใช้ได้"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "สร้างการเชื่อมต่อในแผงควบคุม"
 
@@ -929,26 +930,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "ถ้าคุณต้องการใช้การเปลี่ยนแปลงของคุณ คุณจะต้องเริ่้มต้นระบบใหม่\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "การเปลี่ยนแปลงที่จำเป็นต้องรีสตาร์ท"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "ภายหลัง"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "เริ่มระบบใหม่เดี๋ยวนี้"
 
@@ -1075,19 +1076,26 @@ msgstr "แสดงรายการโปรด"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "ชนิดกุญแจ:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "รูปแบบการยืนยันตัวบุคคล:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ส่วนบุคคล"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "ระบบความปลอดภัยเครือข่ายไร้สาย:"
 
@@ -1104,7 +1112,7 @@ msgstr "ทำต่อ"
 msgid "Join"
 msgstr "ร่วม"
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "เครือข่าย Ad-hoc %d"
diff --git a/po/tpi.po b/po/tpi.po
deleted file mode 100644
index 7fd0d5d..0000000
--- a/po/tpi.po
+++ /dev/null
@@ -1,1713 +0,0 @@
-# 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.1.1rc4\n"
-
-#: ../extensions/cpsection/aboutme/__init__.py:24
-msgid "About Me"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:48
-msgid "You must enter a name."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:75
-#, python-format
-msgid "stroke:   color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:78
-#, python-format
-msgid "stroke:   %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:80
-#, python-format
-msgid "fill:     color=%s hue=%s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:82
-#, python-format
-msgid "fill:     %s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:94
-msgid "Error in specified color modifiers."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/model.py:97
-msgid "Error in specified colors."
-msgstr ""
-
-#: ../extensions/cpsection/aboutme/view.py:235
-msgid "Click to change your color:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/__init__.py:21
-msgid "About my Computer"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:42
-msgid "Not available"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/model.py:171
-#, python-format
-msgid "%(interface)s: %(version)s"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:61
-msgid "Identity"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:70
-msgid "Serial Number:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:92
-msgid "Software"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:101
-msgid "Build:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:116
-msgid "Sugar:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:132
-msgid "Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:147
-msgid "Wireless Firmware:"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:170
-msgid "Copyright and License"
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:188
-msgid ""
-"Sugar is the graphical user interface that you are looking at. Sugar is free "
-"software, covered by the GNU General Public License, and you are welcome to "
-"change it and/or distribute copies of it under certain conditions described "
-"therein."
-msgstr ""
-
-#: ../extensions/cpsection/aboutcomputer/view.py:200
-msgid "Full license:"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr ""
-
-#: ../extensions/cpsection/datetime/model.py:92
-msgid "Error timezone does not exist."
-msgstr ""
-
-#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
-msgid "Timezone"
-msgstr ""
-
-#: ../extensions/cpsection/frame/__init__.py:21
-msgid "Frame"
-msgstr ""
-
-#: ../extensions/cpsection/frame/model.py:41
-#: ../extensions/cpsection/frame/model.py:66
-msgid "Value must be an integer."
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:27
-msgid "never"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:28
-msgid "instantaneous"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:29
-#, python-format
-msgid "%s seconds"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:54
-msgid "Activation Delay"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:78
-msgid "Corner"
-msgstr ""
-
-#: ../extensions/cpsection/frame/view.py:113
-msgid "Edge"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:32
-msgid "Keyboard"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:190
-msgid "Keyboard Model"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:250
-msgid "Key(s) to change layout"
-msgstr ""
-
-#: ../extensions/cpsection/keyboard/view.py:319
-msgid "Keyboard Layout(s)"
-msgstr ""
-
-#: ../extensions/cpsection/language/__init__.py:21
-#: ../extensions/cpsection/language/view.py:33
-msgid "Language"
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:30
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:129
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr ""
-
-#: ../extensions/cpsection/language/model.py:152
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr ""
-
-#: ../extensions/cpsection/language/view.py:57
-msgid ""
-"Add languages in the order you prefer. If a translation is not available, "
-"the next in the list will be used."
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/__init__.py:21
-msgid "Modem Configuration"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:94
-msgid "Username:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:106
-msgid "Password:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:118
-msgid "Number:"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:130
-msgid "Access Point Name (APN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:142
-msgid "Personal Identity Number (PIN):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:154
-msgid "Personal Unblocking Key (PUK):"
-msgstr ""
-
-#: ../extensions/cpsection/modemconfiguration/view.py:175
-msgid ""
-"You will need to provide the following information to set up a mobile "
-"broadband connection to a cellular (3G) network."
-msgstr ""
-
-#: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:29
-msgid "Network"
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:71
-msgid "State is unknown."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:99
-msgid "Error in specified radio argument use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/network/model.py:140
-msgid "Error in specified argument use 0/1."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:61
-msgid "Wireless"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:69
-msgid "Turn off the wireless radio to save battery life"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:82
-msgid "Radio"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:98
-msgid "Discard network history if you have trouble connecting to the network"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:107
-msgid "Discard network history"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:122
-msgid "Collaboration"
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:130
-msgid ""
-"The server is the equivalent of what room you are in; people on the same "
-"server will be able to see each other, even when they aren't on the same "
-"network."
-msgstr ""
-
-#: ../extensions/cpsection/network/view.py:140
-msgid "Server:"
-msgstr ""
-
-#: ../extensions/cpsection/power/__init__.py:21
-msgid "Power"
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:90
-msgid "Error in automatic pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/model.py:120
-msgid "Error in extreme pm argument, use on/off."
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:48
-msgid "Power management"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:58
-msgid "Automatic power management (increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/power/view.py:86
-msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
-msgstr ""
-
-#: ../extensions/cpsection/updater/__init__.py:21
-msgid "Software update"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:63
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities, and "
-"provide new features."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:125
-#, python-format
-msgid "Checking %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:127
-#, python-format
-msgid "Downloading %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:129
-#, python-format
-msgid "Updating %s..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:139
-msgid "Your software is up-to-date"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:141
-#, python-format
-msgid "You can install %s update"
-msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:159
-msgid "Checking for updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:164
-msgid "Installing updates..."
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:173
-#, python-format
-msgid "%s update was installed"
-msgid_plural "%s updates were installed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../extensions/cpsection/updater/view.py:255
-msgid "Install selected"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:276
-#, python-format
-msgid "Download size: %s"
-msgstr ""
-
-#: ../extensions/cpsection/updater/view.py:364
-#, python-format
-msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
-
-#. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:382
-msgid "None"
-msgstr ""
-
-#. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:385
-msgid "1 KB"
-msgstr ""
-
-#. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:388
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:391
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:71
-msgid "My Battery"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:147
-msgid "Removed"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:150
-msgid "Charging"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:153
-msgid "Very little power remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:158
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr ""
-
-#: ../extensions/deviceicon/battery.py:161
-msgid "Charged"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:49
-#, python-format
-msgid "IP address: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:104
-#: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
-msgid "Disconnect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:112
-#: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
-msgid "Connecting..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:117
-#: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
-msgid "Connected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:130
-msgid "No wireless connection"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:144
-msgid "Channel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:159
-msgid "Wired Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:188
-msgid "Speed"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:213
-msgid "Wireless modem"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:281
-msgid "Please wait..."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
-msgid "Connect"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:287
-msgid "Disconnected"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:294
-#: ../src/jarabe/controlpanel/toolbar.py:119
-#: ../src/jarabe/desktop/homebox.py:71
-#: ../src/jarabe/frame/activitiestray.py:602
-#: ../src/jarabe/frame/activitiestray.py:704
-#: ../src/jarabe/frame/activitiestray.py:732
-msgid "Cancel"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:333
-msgid "Try connection again"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:336
-#, python-format
-msgid "Error: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:340
-#, python-format
-msgid "Suggestion: %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:349
-#, python-format
-msgid "Connected for %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:355
-#: ../extensions/deviceicon/network.py:356
-#, python-format
-msgid "%d KB"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:361
-msgid "Check your Pin/Puk configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:364
-msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:368
-msgid "Check the Number configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:370
-msgid "Check your configuration."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:612
-msgid "Mesh Network"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:656
-#, python-format
-msgid "Mesh Network %s"
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:779
-msgid "No GSM connection available."
-msgstr ""
-
-#: ../extensions/deviceicon/network.py:780
-msgid "Create a connection in the control panel."
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:61
-msgid "My Speakers"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:138
-msgid "Unmute"
-msgstr ""
-
-#: ../extensions/deviceicon/speaker.py:141
-msgid "Mute"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:38
-msgid "finger"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:39
-msgid "stylus"
-msgstr ""
-
-#: ../extensions/deviceicon/touchpad.py:68
-msgid "My touchpad"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:59
-msgid "Mesh"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "Group"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "Home"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "Activity"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:72
-msgid "Screenshot"
-msgstr ""
-
-#: ../extensions/globalkey/screenshot.py:74
-#, python-format
-msgid "Screenshot of \"%s\""
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:1
-msgid ""
-"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
-"long name."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:2
-msgid "Additional directories which can contain updated translations."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:3
-msgid "Backup URL"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:4
-msgid "Bundle IDs of protected activities"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:5
-msgid ""
-"Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rgb colors. "
-"Example: #AC32FF,#9A5200"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:6
-msgid "Corner Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:7
-msgid "Default font face"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:8
-msgid "Default font size"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:9
-msgid "Default nick"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:10
-msgid "Delay for the activation of the frame using the corners."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:11
-msgid "Delay for the activation of the frame using the edges."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:12
-msgid "Directory to search for translations"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:13
-msgid "Edge Delay"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:14
-msgid "Favorites Layout"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:15
-msgid "Favorites resume mode"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:16
-msgid "Font face that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:17
-msgid "Font size that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:18
-msgid "GSM network APN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:19
-msgid "GSM network PIN"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:20
-msgid "GSM network PUK"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:21
-msgid "GSM network access point name configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:22
-msgid "GSM network number"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:23
-msgid "GSM network password"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:24
-msgid "GSM network password configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:25
-msgid "GSM network personal identification number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:26
-msgid "GSM network personal unlock key configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:27
-msgid "GSM network telephone number configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:28
-msgid "GSM network username"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:29
-msgid "GSM network username configuration"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:30
-msgid ""
-"If TRUE, Sugar will make us searchable for the other users of the Jabber "
-"server."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:31
-msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:32
-msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:33
-msgid ""
-"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
-"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
-"hoc network."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:34
-msgid "Jabber Server"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:35
-msgid "Keyboard layouts"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:36
-msgid "Keyboard model"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:37
-msgid "Keyboard options"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:38
-msgid "Layout of the favorites view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:39
-msgid ""
-"List of keyboard layouts. Each entry should be in the form layout(variant)"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:40
-msgid "List of keyboard options."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:41
-msgid "Power Automatic"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:42
-msgid "Power Automatic."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:43
-msgid "Power Extreme"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:44
-msgid "Power Extreme."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:45
-msgid "Publish to Gadget"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:46
-msgid "Setting for muting the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:47
-msgid "Show Log out"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:48
-msgid "Show Restart"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:49
-msgid "Show Sugar Ad-hoc networks"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:50
-msgid "Sound Muted"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:51
-msgid "The keyboard model to be used"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:53
-msgid "Timezone setting for the system."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:54
-msgid "Url of the jabber server to use."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:55
-msgid "Url where the backup is saved to."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:56
-msgid "User Color"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:57
-msgid "User Name"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:58
-msgid "User name that is used throughout the desktop."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:59
-msgid ""
-"Users will not be allowed to erase these activities through the list view."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:60
-msgid "Volume Level"
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:61
-msgid "Volume level for the sound device."
-msgstr ""
-
-#: ../data/sugar.schemas.in.h:62
-msgid ""
-"When in resume mode, clicking on a favorite icon will cause the last entry "
-"for that activity to be resumed."
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:28
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:30
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:31
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr ""
-
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:38
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
-msgstr ""
-
-#: ../src/jarabe/controlpanel/cmd.py:52
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
-#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
-#: ../src/jarabe/journal/volumestoolbar.py:307
-msgid "Warning"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:297
-#: ../src/jarabe/controlpanel/sectionview.py:41
-msgid "Changes require restart"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:300
-msgid "Cancel changes"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
-msgid "Later"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/gui.py:309
-msgid "Restart now"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
-msgid "Done"
-msgstr ""
-
-#: ../src/jarabe/controlpanel/toolbar.py:125
-#: ../src/jarabe/desktop/favoritesview.py:347
-msgid "Ok"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:230
-#, python-format
-msgid "Version %s"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:356
-msgid "Confirm erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:358
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:362
-#: ../src/jarabe/frame/clipboardmenu.py:67
-#: ../src/jarabe/view/viewsource.py:280
-msgid "Keep"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:365
-#: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
-#: ../src/jarabe/journal/palettes.py:126
-msgid "Erase"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:435
-msgid "Remove favorite"
-msgstr ""
-
-#: ../src/jarabe/desktop/activitieslist.py:439
-msgid "Make favorite"
-msgstr ""
-
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:127
-msgid "Freeform"
-msgstr ""
-
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:215
-msgid "Ring"
-msgstr ""
-
-#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:402
-msgid "Spiral"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:472
-msgid "Box"
-msgstr ""
-
-#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:515
-msgid "Triangle"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:338
-msgid "Registration Failed"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:339
-#, python-format
-msgid "%s"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:341
-msgid "Registration Successful"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:342
-msgid "You are now registered with your school server."
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:641
-msgid "Register"
-msgstr ""
-
-#: ../src/jarabe/desktop/favoritesview.py:643
-#: ../src/jarabe/desktop/favoritesview.py:660
-msgid "Register again"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:66
-msgid "Software Update"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:67
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:76
-msgid "Check now"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:197
-msgid "List view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:198
-msgid "<Ctrl>2"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:253
-msgid "Favorites view"
-msgstr ""
-
-#: ../src/jarabe/desktop/homebox.py:254
-msgid "<Ctrl>1"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:143
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:163
-msgid "Authentication Type:"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:229
-msgid "WPA & WPA2 Personal"
-msgstr ""
-
-#: ../src/jarabe/desktop/keydialog.py:238
-msgid "Wireless Security:"
-msgstr ""
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
-#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
-msgid "Resume"
-msgstr ""
-
-#: ../src/jarabe/desktop/meshbox.py:96
-#: ../src/jarabe/frame/activitiestray.py:182
-msgid "Join"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:500
-#, python-format
-msgid "Ad-hoc Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format
-msgid "Mesh Network %d"
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:143
-msgid "Cannot connect to the server."
-msgstr ""
-
-#: ../src/jarabe/desktop/schoolserver.py:150
-msgid "The server could not complete the request."
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:187
-#: ../src/jarabe/frame/activitiestray.py:574
-msgid "Decline"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:523
-#, python-format
-msgid "%dB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:525
-#, python-format
-msgid "%dKB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:527
-#, python-format
-msgid "%dMB"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:544
-#, python-format
-msgid "%s of %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:558
-#, python-format
-msgid "Transfer from %s"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:569
-msgid "Accept"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:592
-#: ../src/jarabe/frame/activitiestray.py:722
-#, python-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:626
-#: ../src/jarabe/frame/activitiestray.py:639
-#: ../src/jarabe/frame/activitiestray.py:757
-msgid "Dismiss"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:643
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#: ../src/jarabe/frame/activitiestray.py:691
-#, python-format
-msgid "Transfer to %s"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:56
-msgctxt "Clipboard"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:62
-#: ../src/jarabe/frame/clipboardmenu.py:85
-msgid "Open"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardmenu.py:90
-msgid "Open with"
-msgstr ""
-
-#: ../src/jarabe/frame/clipboardobject.py:50
-#, python-format
-msgid "%s clipping"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "Neighborhood"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:39
-msgid "F1"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:41
-msgid "F2"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:43
-msgid "F3"
-msgstr ""
-
-#: ../src/jarabe/frame/zoomtoolbar.py:45
-msgid "F4"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:90
-msgid "Name:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:126
-msgid "Click to change color:"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
-msgid "Back"
-msgstr ""
-
-#: ../src/jarabe/intro/window.py:204
-msgid "Next"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:156
-#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
-#: ../src/jarabe/journal/volumestoolbar.py:130
-msgid "Untitled"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:245
-msgid "No preview"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#, python-format
-msgid "Kind: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:264
-#: ../src/jarabe/journal/listmodel.py:150
-#: ../src/jarabe/journal/listmodel.py:158
-msgid "Unknown"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:265
-#, python-format
-msgid "Date: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:266
-#, python-format
-msgid "Size: %s"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:294
-#: ../src/jarabe/journal/misc.py:108
-msgid "No date"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:301
-msgid "Participants:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:323
-msgid "Description:"
-msgstr ""
-
-#: ../src/jarabe/journal/expandedentry.py:348
-msgid "Tags:"
-msgstr ""
-
-#: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
-#: ../src/jarabe/journal/palettes.py:198
-#: ../src/jarabe/journal/volumestoolbar.py:368
-msgid "Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:71
-msgid "Search"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:138
-msgid "Anytime"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:140
-msgid "Today"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:142
-msgid "Since yesterday"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
-msgid "Past week"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
-msgid "Past month"
-msgstr ""
-
-#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
-msgid "Past year"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:155
-msgid "Anyone"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:157
-msgid "My friends"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:158
-msgid "My class"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:300
-msgid "Anything"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:381
-#: ../src/jarabe/journal/palettes.py:93
-msgid "Copy to"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:389
-#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:422
-#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
-#: ../src/jarabe/journal/volumestoolbar.py:315
-#, python-format
-msgid "Error while copying the entry. %s"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:423
-#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
-#: ../src/jarabe/journal/volumestoolbar.py:316
-msgid "Error"
-msgstr ""
-
-#. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
-#: ../src/jarabe/journal/palettes.py:74
-msgid "Start"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:525
-msgid "Sort by date modified"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:526
-msgid "Sort by date created"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:527
-msgid "Sort by size"
-msgstr ""
-
-#: ../src/jarabe/journal/journaltoolbox.py:536
-msgid "Sort view"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:316
-msgid "Your Journal is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:319
-msgid "Your documents folder is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:321
-msgid "The device is empty"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:323
-msgid "No matching entries"
-msgstr ""
-
-#: ../src/jarabe/journal/listview.py:397
-msgid "Clear search"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:273
-#, python-format
-msgid "Older Version Of %s Activity"
-msgstr ""
-
-#: ../src/jarabe/journal/misc.py:274
-#, python-format
-msgid "Do you want to downgrade to version %s"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:64
-msgid "Your Journal is full"
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:68
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-
-#: ../src/jarabe/journal/modalalert.py:80
-msgid "Show Journal"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:146
-msgid "Choose an object"
-msgstr ""
-
-#: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:410
-msgid "Close"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:72
-msgid "Resume with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:75
-msgid "Start with"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
-msgid "No activity to start entry"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:112
-msgid "Send to"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:121
-msgid "View Details"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:160
-msgid "Entries without a file cannot be sent."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
-#: ../src/jarabe/journal/volumestoolbar.py:306
-msgid "Entries without a file cannot be copied."
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:267
-msgid "Clipboard"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:322
-msgid "No friends present"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:327
-msgid "No valid connection found"
-msgstr ""
-
-#: ../src/jarabe/journal/palettes.py:355
-msgid "No activity to resume entry"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:209
-msgid "Documents"
-msgstr ""
-
-#: ../src/jarabe/journal/volumestoolbar.py:391
-#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:163
-msgid "The reason for the device state change is unknown."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:165
-msgid "The state change is normal."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:167
-msgid "The device is now managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:169
-msgid "The device is no longer managed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:171
-msgid "The device could not be readied for configuration."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:173
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc)."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:176
-msgid "The IP configuration is no longer valid."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:178
-msgid "Secrets were required, but not provided."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:180
-msgid ""
-"The 802.1X supplicant disconnected from the access point or authentication "
-"server."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:183
-msgid "Configuration of the 802.1X supplicant failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:185
-msgid "The 802.1X supplicant quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:187
-msgid "The 802.1X supplicant took too long to authenticate."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:189
-msgid "The PPP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:191
-msgid "The PPP service disconnected unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:193
-msgid "The PPP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:195
-msgid "The DHCP service failed to start within the allowed time."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:197
-msgid "The DHCP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:199
-msgid "The DHCP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:201
-msgid "The shared connection service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:203
-msgid "The shared connection service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:206
-msgid "The AutoIP service failed to start."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:208
-msgid "The AutoIP service reported an unexpected error."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:210
-msgid "The AutoIP service quit or failed unexpectedly."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:212
-msgid "Dialing failed because the line was busy."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:214
-msgid "Dialing failed because there was no dial tone."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:216
-msgid "Dialing failed because there was no carrier."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:218
-msgid "Dialing timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:220
-msgid "Dialing failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:222
-msgid "Modem initialization failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:224
-msgid "Failed to select the specified GSM APN"
-msgstr ""
-
-#: ../src/jarabe/model/network.py:226
-msgid "Not searching for networks."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:228
-msgid "Network registration was denied."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:230
-msgid "Network registration timed out."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:232
-msgid "Failed to register with the requested GSM network."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:234
-msgid "PIN check failed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:236
-msgid "Necessary firmware for the device may be missing."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:238
-msgid "The device was removed."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:240
-msgid "NetworkManager went to sleep."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:242
-msgid "The device's active connection was removed or disappeared."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:245
-msgid "A user or client requested the disconnection."
-msgstr ""
-
-#: ../src/jarabe/model/network.py:247
-msgid "The device's carrier/link changed."
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:67
-msgid "Remove friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:70
-msgid "Make friend"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:87
-msgid "Shutdown"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:95
-msgid "Restart"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:101
-msgid "Logout"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:106
-msgid "My Settings"
-msgstr ""
-
-#: ../src/jarabe/view/buddymenu.py:142
-#, python-format
-msgid "Invite to %s"
-msgstr ""
-
-#: ../src/jarabe/view/launcher.py:145
-#, python-format
-msgid "<b>%s</b> failed to start."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:48
-msgid "Starting..."
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:58
-msgid "Activity failed to start"
-msgstr ""
-
-#. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:91
-msgid "View Source"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:102
-msgid "Stop"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:139
-msgid "Start new"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:180
-msgid "Show contents"
-msgstr ""
-
-#: ../src/jarabe/view/palettes.py:229
-msgctxt "Volume"
-msgid "Remove"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:263
-msgid "Instance Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:312
-msgid "Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:374
-msgid "Activity Bundle Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:393
-msgid "Sugar Toolkit Source"
-msgstr ""
-
-#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
-#, python-format
-msgid "View source: %r"
-msgstr ""
-
-#: ../src/jarabe/util/emulator.py:40
-msgid "Sugar in a window"
-msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 54bca11..14ca9ff 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2008-09-26 09:38-0400\n"
 "Last-Translator: abdullah kocabas <abdullah.kocabas@abcdizustu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,48 +59,48 @@ msgstr "Renk değiştirmek için tıklayınız:"
 msgid "About my Computer"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Mevcut değil"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Kimlik"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Seri Numarası:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Yazılım"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Yapı:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Aygıt Yazılımı:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr ""
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Telif Hakkı ve Lisans"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -112,7 +112,7 @@ msgstr ""
 "değiştirebilir ve/veya burada açıklanan belli koşullar altında kopyasını "
 "dağıtabilirsiniz."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Tam Lisans:"
 
@@ -442,25 +442,25 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Bağlantıyı kes"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Bağlı"
 
@@ -489,9 +489,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -549,20 +549,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Mesh Ağı"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %s"
 msgstr "Mesh Ağı"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -925,26 +926,26 @@ msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Değişikliklerinizin etkinleşmesi için bilgisayarı tekrar başlatmanız "
 "gerekiyor\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
 #: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
 #: ../src/jarabe/journal/volumestoolbar.py:307
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Değişiklikler bilgisayarın tekrar başlatılmasını gerektiriyor"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Değişiklikleri İptal Et"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Daha Sonra"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Şimdi Tekrar Başlat"
 
@@ -979,7 +980,7 @@ msgstr "Kaydet"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Silme"
@@ -1071,25 +1072,32 @@ msgstr "Favoriler Görünümü"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Tuş Çeşidi:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Kimlik Denetleme Çeşidi:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Devam Et"
@@ -1099,12 +1107,13 @@ msgstr "Devam Et"
 msgid "Join"
 msgstr "Katıl"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
 #, python-format, fuzzy
 msgid "Mesh Network %d"
 msgstr "Mesh Ağı"
@@ -1277,101 +1286,101 @@ msgid "Tags:"
 msgstr "Etiketler:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Günlük"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Arama"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Herhangi bir zaman"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Bugün"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Dünden itibaren"
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Geçen hafta"
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Geçen ay"
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Geçen yıl"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Herhangi biri"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Arkadaşlarım"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Sınıfım"
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Herhangi bir şey"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Başlat"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/ur.po b/po/ur.po
index 68bcb36..d04d6f3 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,14 +6,16 @@ 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: 2008-08-05 23:34-0400\n"
-"Last-Translator: Huda Sarfraz <huda.sarfraz@nu.edu.pk>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-04-09 19:06+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
@@ -55,234 +57,291 @@ msgstr "اختصاص کردہ رنگوں میں نقص۔"
 msgid "Click to change your color:"
 msgstr "رنگ تبديل کرنے کے ليے کلک کريں:"
 
+# کمپیوٹر کے بارے میں
 #: ../extensions/cpsection/aboutcomputer/__init__.py:21
 msgid "About my Computer"
-msgstr ""
+msgstr "کمپیوٹر کے بارے میں"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "دستیاب نہيں"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+# %(interface)s: %(version)s
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
-msgstr ""
+msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "پہچان"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "سيريل نمبر:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+# سافٹ ویئر
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
-msgstr "Software"
+msgstr "سافٹ ویئر"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "سسٹم:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+# شوگر
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
-msgstr ""
+msgstr "شوگر"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "فرم ویئر"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+# وائرلیس فرم وئر:
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
-msgstr ""
+msgstr "وائرلیس فرم وئر:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+# کاپی رائٹ اور لائسنس
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
-msgstr ""
+msgstr "کاپی رائٹ اور لائسنس"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+# شوگر گرافیکل یوزر انٹرفیس ہے جسے آپ دیکھ  رہے ہیں ہے. شوگ مفت سافٹ ویئر یے، GNU جنرل پبلک لائسنس کے تحت،  اور آپ کو اسے تبدیل کرنے  یا تقسیم کرنے کا اختیار دیا جاتا ہے ہے مخصوص شرائط کے تحت۔
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
 "change it and/or distribute copies of it under certain conditions described "
 "therein."
 msgstr ""
+"شوگر گرافیکل یوزر انٹرفیس ہے جسے آپ دیکھ رہے ہیں ہے. شوگ مفت سافٹ ویئر یے، "
+"GNU جنرل پبلک لائسنس کے تحت، اور آپ کو اسے تبدیل کرنے یا تقسیم کرنے کا "
+"اختیار دیا جاتا ہے ہے مخصوص شرائط کے تحت۔"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+# مکمل لائسنس :
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
-msgstr ""
+msgstr "مکمل لائسنس :"
 
+# تاريخ & وقت
 #: ../extensions/cpsection/datetime/__init__.py:21
 msgid "Date & Time"
 msgstr "تاريخ & وقت"
 
+# نقص، ٹائم زون موجود نہیں ہے۔
 #: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
-msgstr "نقص، ٹائیم زون موجود نہیں ہے۔"
+msgstr "نقص، ٹائم زون موجود نہیں ہے۔"
 
+# ٹائم زون
 #: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 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 "اچانک"
+msgstr "فوری"
 
+# %s سيکنڈ
 #: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr "%s سيکنڈ"
 
+# چالو کرنے میں تاخیر
 #: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
-msgstr "ايکٹيويشن وقفہ"
+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 ""
+msgstr "کی بورڈ"
 
+# کی بورڈ ماڈل
 #: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
-msgstr ""
+msgstr "کی بورڈ ماڈل"
 
+# ترتیب تبدیل کرنے کی کی
 #: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
-msgstr ""
+msgstr "ترتیب تبدیل کرنے کی کی"
 
+# کی بورڈ ترتیب
 #: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
-msgstr ""
+msgstr "کی بورڈ ترتیب"
 
+# زبان
 #: ../extensions/cpsection/language/__init__.py:21
 #: ../extensions/cpsection/language/view.py:33
 msgid "Language"
 msgstr "زبان"
 
+# رسائی ممکن نہيں~/.n18. سٹينڈرڈ بنائيں.
 #: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "رسائی ممکن نہيں~/.n18. سٹينڈرڈ بنائيں."
 
+# کوڈ=%s کی زبان کا تعین نہیں کیا جا سکا۔
 #: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
-msgstr "کوڈ=%s کی زبان تعین نہیں کی جا سکی۔"
+msgstr "کوڈ=%s کی زبان کا تعین نہیں کیا جا سکا۔"
 
+# معاف کيجيے ہم '%s' نہيں سمجھتے۔
 #: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
-msgstr "معاف کيجيے ميں '%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 ""
+msgstr "موڈیم کی ترتیب"
 
+# صارف کا نام
 #: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
-msgstr ""
+msgstr "صارف کا نام"
 
+# پاس ورڈ
 #: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
-msgstr ""
+msgstr "پاس ورڈ"
 
+# نمبر
 #: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
-msgstr ""
+msgstr "نمبر"
 
+# رسائی نقطہ کا نام (APN)
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
-msgstr ""
+msgstr "رسائی نقطہ کا نام (APN)"
 
+# ذاتی شناختی نمبر (PIN)
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
-msgstr ""
+msgstr "ذاتی شناختی نمبر (PIN)"
 
+# زاتی ان بلاکینگ کی (PUK)
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
-msgstr ""
+msgstr "زاتی ان بلاکینگ کی (PUK)"
 
+# سیلولر نیٹ ورک (3G) اور موبائل براڈبینڈ کنکشن قائم کرنے کے لئے آپ کو مندجہ زیل معلومات فرہم کرنا ہونگی۔
 #: ../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 "اختصاص کردہ ریڈیو آرگیومنٹ میں نقص، آن/آف استعمال کریں۔"
+msgstr "مخصوص کردہ ریڈیو آرگیومنٹ میں نقص، آن/آف استعمال کریں۔"
 
+# مخصوص آرگیومنٹ میں نقص ہو تو، 0/1 استعمال کریں۔
 #: ../extensions/cpsection/network/model.py:140
-#, fuzzy
 msgid "Error in specified argument use 0/1."
-msgstr "اختصاص کردہ ریڈیو آرگیومنٹ میں نقص، آن/آف استعمال کریں۔"
+msgstr "مخصوص آرگیومنٹ میں نقص ہو تو، 0/1 استعمال کریں۔"
 
+# وائرلیس
 #: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
-msgstr "وائيرليس"
+msgstr "وائرلیس"
 
+# وائرلیس ریڈیو کو بند کر دیں، بیٹری کی زندگی بچانے کے لئے۔
 #: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
-msgstr ""
+msgstr "وائرلیس ریڈیو کو بند کر دیں، بیٹری کی زندگی بچانے کے لئے۔"
 
+# ریڈيو:
 #: ../extensions/cpsection/network/view.py:82
 #, fuzzy
 msgid "Radio"
 msgstr "ریڈيو:"
 
+# نیٹ ورک کی تاریخ کو ضائع کر دیا جائے، اگر آپ کو نیٹ ورک کے ساتھ منسلک کرنےمیں پریشانی یے۔
 #: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
+"نیٹ ورک کی تاریخ کو ضائع کر دیا جائے، اگر آپ کو نیٹ ورک کے ساتھ منسلک "
+"کرنےمیں پریشانی یے۔"
 
+# نیٹ ورک کی تاریخ ضائع کر دیا جائے
 #: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
-msgstr ""
+msgstr "نیٹ ورک کی تاریخ ضائع کر دیا جائے"
 
+# تعاون
 #: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
-msgstr ""
+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:"
@@ -308,107 +367,137 @@ msgstr "پاور کنٹرول"
 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 ""
+msgstr "سافٹ ویئر اپ ڈیٹ"
 
+# سافٹ ویئر اپ ڈیٹس  غلطیاں درست کرتا ہے، سیکورٹی کے خطرات کے خاتمے، اور نئی خصوصیات کی فراہمی.
 #: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
 msgstr ""
+"سافٹ ویئر اپ ڈیٹس غلطیاں درست کرتا ہے، سیکورٹی کے خطرات کے خاتمے، اور نئی "
+"خصوصیات کی فراہمی."
 
+# ..s٪  جانچ کی جا رہی
 #: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
-msgstr ""
+msgstr "..s% جانچ کی جا رہی"
 
+# s٪  ڈاؤن لوڈ کیا جا رہا ہے...
 #: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
-msgstr ""
+msgstr "s% ڈاؤن لوڈ کیا جا رہا ہے..."
 
+# s٪ اپ ڈیٹ کیا جا رہا ہے...
 #: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
-msgstr ""
+msgstr "s% اپ ڈیٹ کیا جا رہا ہے..."
 
+# آپ کا سافٹ ویئر اپ ڈیٹ ہے
 #: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
-msgstr ""
+msgstr "آپ کا سافٹ ویئر اپ ڈیٹ ہے"
 
 #: ../extensions/cpsection/updater/view.py:141
 #, python-format
+#, python-format, fuzzy
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
+"واحدآپ s% کے اپ ڈیٹ کو انسٹال کر سکتے ہیںجمعآپ s% کے اپ ڈیٹ کو انسٹال کر "
+"سکتے ہیں"
 msgstr[1] ""
+"جمع فارم 0آپ  s% کے اپ ڈیٹ کو انسٹال کر سکتے ہیںجمع فارم 1آپ  s% کے اپ ڈیٹ "
+"کو انسٹال کر سکتے ہیں"
 
+# اپ ڈیٹس کے لئے جانچ کی جا رہی...
 #: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
-msgstr ""
+msgstr "اپ ڈیٹس کے لئے جانچ کی جا رہی..."
 
+# اپ ڈیٹس کی انسٹالیشن ہورہی ہے...
 #: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
-msgstr ""
+msgstr "اپ ڈیٹس کی انسٹالیشن ہورہی ہے..."
 
 #: ../extensions/cpsection/updater/view.py:173
 #, python-format
+#, python-format, fuzzy
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] ""
+"واحدs٪  اپ ڈیٹ کو انسٹال کر دیا گیا تھاجمعs%  اپ ڈیٹ کو انسٹال کر دیا گیا "
+"تھا"
 msgstr[1] ""
+"جمع فارم 0s%  اپ ڈیٹ کو انسٹال کر دیا گیا تھاجمع فارم 1s%  اپ ڈیٹ کو انسٹال "
+"کر دیا گیا تھا"
 
+#  منتخب کردہ انسٹال کریں
 #: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
-msgstr ""
+msgstr "منتخب کردہ انسٹال کریں"
 
+# ڈاؤن لوڈ کا سائز : s٪
 #: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "ڈاؤن لوڈ کا سائز : s%"
 
+#  پرانے ورژن  current)s)% سے %(new)s (Size: %(size)s)
 #: ../extensions/cpsection/updater/view.py:364
 #, python-format
+#, python-format, fuzzy
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr ""
+msgstr " پرانے ورژن  current)s)% سے %(new)s (Size: %(size)s)"
 
+# کچھ نہیں
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
-#, fuzzy
 msgid "None"
-msgstr "مکمل"
+msgstr "کچھ نہیں"
 
+# ترجمہ : بہت چھوٹے اپ ڈیٹس کے ڈاؤن لوڈ کا سائز
 #. TRANS: download size of very small updates
 #: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
+# ترجمہ : بہت چھوٹے اپ ڈیٹس کے ڈاؤن لوڈ کا سائز, مثال 250 KB
 #. TRANS: download size of small updates, e.g. '250 KB'
 #: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
+# ترجمہ : اپ ڈیٹس کے ڈاؤن لوڈ کا سائز، مثال 2.3 MB
 #. TRANS: download size of updates, e.g. '2.3 MB'
 #: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../extensions/deviceicon/battery.py:71
 msgid "My Battery"
 msgstr "ميری بيٹری"
 
+# خارج کر دیا
 #: ../extensions/deviceicon/battery.py:147
-#, fuzzy
 msgid "Removed"
-msgstr "ہٹائيں"
+msgstr "خارج کر دیا"
 
 #: ../extensions/deviceicon/battery.py:150
 msgid "Charging"
@@ -427,15 +516,16 @@ msgstr "%(hour)d:%(min).2d رہ گئے ہيں"
 msgid "Charged"
 msgstr "چارج ہو گئی ہے"
 
+# IP ایڈریس : s٪
 #: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
-msgstr ""
+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
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "منقطع کریں"
 
@@ -445,48 +535,53 @@ msgstr "منقطع کریں"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 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
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "کنيکشن ہو گيا ہے"
 
+# کوئی وائرلیس کنکشن نہیں
 #: ../extensions/deviceicon/network.py:130
 msgid "No wireless connection"
-msgstr ""
+msgstr "کوئی وائرلیس کنکشن نہیں"
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
 msgstr "چينل"
 
+# وائرڈ نیٹ ورک
 #: ../extensions/deviceicon/network.py:159
 msgid "Wired Network"
-msgstr ""
+msgstr "وائرڈ نیٹ ورک"
 
+# رفتار
 #: ../extensions/deviceicon/network.py:188
 msgid "Speed"
-msgstr ""
+msgstr "رفتار"
 
+# وائرلیس موڈیم
 #: ../extensions/deviceicon/network.py:213
 msgid "Wireless modem"
-msgstr ""
+msgstr "وائرلیس موڈیم"
 
+# براہ مہربانی انتظار کریں...
 #: ../extensions/deviceicon/network.py:281
 msgid "Please wait..."
-msgstr ""
+msgstr "براہ مہربانی انتظار کریں..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "کنيکٹ"
 
@@ -503,63 +598,75 @@ msgstr "منقطع ہو گیا"
 msgid "Cancel"
 msgstr "منسوخ کريں"
 
+# کنکشن کی پھر سے کوشش کریں
 #: ../extensions/deviceicon/network.py:333
 msgid "Try connection again"
-msgstr ""
+msgstr "کنکشن کی پھر سے کوشش کریں"
 
+# غلطی s%
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "غلطی s%"
 
+# تجاویز s%
 #: ../extensions/deviceicon/network.py:340
 #, python-format
 msgid "Suggestion: %s"
-msgstr ""
+msgstr "تجاویز s%"
 
+#  منسلک ہے s%
 #: ../extensions/deviceicon/network.py:349
 #, python-format
 msgid "Connected for %s"
-msgstr ""
+msgstr "منسلک ہے s%"
 
+# %d KB
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
 #, python-format
 msgid "%d KB"
-msgstr ""
+msgstr "%d KB"
 
+# اپنا PIN / Puk ترتیب چیک کریں.
 #: ../extensions/deviceicon/network.py:361
 msgid "Check your Pin/Puk configuration."
-msgstr ""
+msgstr "اپنا PIN / Puk ترتیب چیک کریں."
 
+# اپنئ رسائی نقطہ کے نام کی ترتیب (APN) چیک کریں
 #: ../extensions/deviceicon/network.py:364
 msgid "Check your Access Point Name (APN) configuration"
-msgstr ""
+msgstr "اپنئ رسائی نقطہ کے نام کی ترتیب (APN) چیک کریں"
 
+# نمبر ترتیب کو چیک کریں.
 #: ../extensions/deviceicon/network.py:368
 msgid "Check the Number configuration."
-msgstr ""
+msgstr "نمبر ترتیب کو چیک کریں."
 
+# اپنی کنفیگریشن کو چیک کریں.
 #: ../extensions/deviceicon/network.py:370
 msgid "Check your configuration."
-msgstr ""
+msgstr "اپنی کنفیگریشن کو چیک کریں."
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "ميش نيٹ ورک"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, fuzzy
+#: ../extensions/deviceicon/network.py:659
+#, python-format
+#, python-format,
 msgid "Mesh Network %s"
-msgstr "ميش نيٹ ورک"
+msgstr "ميش نيٹ ورک %s"
 
-#: ../extensions/deviceicon/network.py:779
+# کوئی GSM کنکشن دستیاب نہیں ہے.
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
-msgstr ""
+msgstr "کوئی GSM کنکشن دستیاب نہیں ہے."
 
-#: ../extensions/deviceicon/network.py:780
+# کنٹرول پینل میں ایک کنکشن بنائیں.
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
-msgstr ""
+msgstr "کنٹرول پینل میں ایک کنکشن بنائیں."
 
 #: ../extensions/deviceicon/speaker.py:61
 msgid "My Speakers"
@@ -573,17 +680,20 @@ msgstr "ان ميوٹ"
 msgid "Mute"
 msgstr "ميوٹ"
 
+# انگلی کریں
 #: ../extensions/deviceicon/touchpad.py:38
 msgid "finger"
-msgstr ""
+msgstr "انگلی کریں"
 
+# اسٹاہلس
 #: ../extensions/deviceicon/touchpad.py:39
 msgid "stylus"
-msgstr ""
+msgstr "اسٹاہلس"
 
+# میرا ٹچ پیڈ
 #: ../extensions/deviceicon/touchpad.py:68
 msgid "My touchpad"
-msgstr ""
+msgstr "میرا ٹچ پیڈ"
 
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
@@ -608,145 +718,185 @@ msgstr "سرگرمی"
 msgid "Screenshot"
 msgstr "سکرين شاٹ"
 
+# "s%" کے اسکرین شاٹ
 #: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
-msgstr ""
+msgstr "\"s%\" کے اسکرین شاٹ"
 
+# ابتدا پر نک پوچھنے کو "غیر فعال کر دیا گیا"،  UNIX "نظام" اکاؤنٹ کے تہت طویل نام کو دوبارہ استعمال کرنے کے لئے.
 #: ../data/sugar.schemas.in.h:1
 msgid ""
 "\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
 "long name."
 msgstr ""
+"ابتدا پر نک پوچھنے کو \"غیر فعال کر دیا گیا\"،  UNIX \"نظام\" اکاؤنٹ کے تہت طویل "
+"نام کو دوبارہ استعمال کرنے کے لئے."
 
+# اضافی ڈائرکٹری جس میں اپ ڈیٹ  ترجمے ہوسکتے ہیں.
 #: ../data/sugar.schemas.in.h:2
 msgid "Additional directories which can contain updated translations."
-msgstr ""
+msgstr "اضافی ڈائرکٹری جس میں اپ ڈیٹ  ترجمے ہوسکتے ہیں."
 
+# بیک اپ URL
 #: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
-msgstr ""
+msgstr "بیک اپ URL"
 
+# محفوظ سرگرمیوں کی پوٹلی کی شناخت
 #: ../data/sugar.schemas.in.h:4
 msgid "Bundle IDs of protected activities"
-msgstr ""
+msgstr "محفوظ سرگرمیوں کی پوٹلی کی شناخت"
 
+# XO آئکن  کے لئے رنگ جو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے.  سٹرنگ سٹروک رنگ اور بھرنے کے رنگ پر مشتمل ہے، فارمیٹ ہے RGB رنگوں کا .مثال کے طور پر : # AC32FF، 9A5200 #
 #: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
 "composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr ""
+"XO آئکن  کے لئے رنگ جو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے.  سٹرنگ سٹروک "
+"رنگ اور بھرنے کے رنگ پر مشتمل ہے، فارمیٹ ہے RGB رنگوں کا .مثال کے طور پر : # "
+"AC32FF، 9A5200 #"
 
+# کارنر کی تاخیر
 #: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
-msgstr ""
+msgstr "کارنر کی تاخیر"
 
+# پہلے سے مقرر شدہ فانٹ کا چہرہ
 #: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
-msgstr ""
+msgstr "پہلے سے مقرر شدہ فانٹ کا چہرہ"
 
+# پہلے سے مقرر شدہ فونٹ سائز
 #: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
-msgstr ""
+msgstr "پہلے سے مقرر شدہ فونٹ سائز"
 
+# پہلے سے طے شدہ نک
 #: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
-msgstr ""
+msgstr "پہلے سے طے شدہ نک"
 
+# کونے کونے کا استعمال کرتے ہوئے فریم کی ایکٹیویشن کے لئے تاخیر.
 #: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
-msgstr ""
+msgstr "کونے کونے کا استعمال کرتے ہوئے فریم کی ایکٹیویشن کے لئے تاخیر."
 
+# کناروں کو استعمال کرتے ہوئے فریم کی ایکٹیویشن کے لئے تاخیر.
 #: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
-msgstr ""
+msgstr "کناروں کو استعمال کرتے ہوئے فریم کی ایکٹیویشن کے لئے تاخیر."
 
+# ترجمہ کی تلاش کے لئے ڈائرکٹری
 #: ../data/sugar.schemas.in.h:12
 msgid "Directory to search for translations"
-msgstr ""
+msgstr "ترجمہ کی تلاش کے لئے ڈائرکٹری"
 
+# ایج تاخیر
 #: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
-msgstr ""
+msgstr "ایج تاخیر"
 
+# پسنديدہ خاکہ
 #: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
-msgstr ""
+msgstr "پسنديدہ خاکہ"
 
+# پسنديدہ موڈ کو دوبارہ شروع کرنے کے لٰے
 #: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
-msgstr ""
+msgstr "پسنديدہ موڈ کو دوبارہ شروع کرنے کے لٰے"
 
+# فونٹ جو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے
 #: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
-msgstr ""
+msgstr "فونٹ جو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے"
 
+# فونٹ سائزجو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے.
 #: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
-msgstr ""
+msgstr "فونٹ سائزجو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے."
 
+# GSM نیٹ ورک APN
 #: ../data/sugar.schemas.in.h:18
 msgid "GSM network APN"
-msgstr ""
+msgstr "GSM نیٹ ورک APN"
 
+# GSM نیٹ ورک PIN
 #: ../data/sugar.schemas.in.h:19
 msgid "GSM network PIN"
-msgstr ""
+msgstr "GSM نیٹ ورک PIN"
 
+# GSM نیٹ ورک PUN
 #: ../data/sugar.schemas.in.h:20
 msgid "GSM network PUK"
-msgstr ""
+msgstr "GSM نیٹ ورک PUK"
 
+# GSM نیٹ ورک تک رسائی کے نقطہ نام کی ترتیب
 #: ../data/sugar.schemas.in.h:21
 msgid "GSM network access point name configuration"
-msgstr ""
+msgstr "GSM نیٹ ورک تک رسائی کے نقطہ نام کی ترتیب"
 
+# GSM نیٹ ورک نمبر
 #: ../data/sugar.schemas.in.h:22
 msgid "GSM network number"
-msgstr ""
+msgstr "GSM نیٹ ورک نمبر"
 
+# GSM نیٹ ورک پاس ورڈ
 #: ../data/sugar.schemas.in.h:23
 msgid "GSM network password"
-msgstr ""
+msgstr "GSM نیٹ ورک پاس ورڈ"
 
+# GSM نیٹ ورک پاس ورڈ کی ترتیب
 #: ../data/sugar.schemas.in.h:24
 msgid "GSM network password configuration"
-msgstr ""
+msgstr "GSM نیٹ ورک پاس ورڈ کی ترتیب"
 
+# GSM نیٹ ورک کی ذاتی شناختی نمبر کی ترتیب
 #: ../data/sugar.schemas.in.h:25
 msgid "GSM network personal identification number configuration"
-msgstr ""
+msgstr "GSM نیٹ ورک کی ذاتی شناختی نمبر کی ترتیب"
 
+# GSM نیٹ ورک کی ذاتی کھولنے کی کلید کی ترتیب
 #: ../data/sugar.schemas.in.h:26
 msgid "GSM network personal unlock key configuration"
-msgstr ""
+msgstr "GSM نیٹ ورک کی ذاتی کھولنے کی کلید کی ترتیب"
 
+# GSM نیٹ ورک ٹیلی فون نمبر کی ترتیب
 #: ../data/sugar.schemas.in.h:27
 msgid "GSM network telephone number configuration"
-msgstr ""
+msgstr "GSM نیٹ ورک ٹیلی فون نمبر کی ترتیب"
 
+# GSM نیٹ ورک صارف کا نام
 #: ../data/sugar.schemas.in.h:28
 msgid "GSM network username"
-msgstr ""
+msgstr "GSM نیٹ ورک صارف کا نام"
 
+# GSM نیٹ ورک صارف کا نام کی ترتیب
 #: ../data/sugar.schemas.in.h:29
 msgid "GSM network username configuration"
-msgstr ""
+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 ""
+"اگر یہ سچ ہے تو شوگر ہمیں جیبر سرور کے دیگر صارفین کے لئے تلاش کرنا آسان بنا "
+"دے گا."
 
+# اگر یہ سچ ہے تو، شوگر  "لاگ آؤٹ" کا اختیار دے گا.
 #: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
-msgstr ""
+msgstr "اگر یہ سچ ہے تو، شوگر  \"لاگ آؤٹ\" کا اختیار دے گا."
 
+# اگر یہ سچ ہے تو، شوگر "Restart" کا اختیار دے گا.
 #: ../data/sugar.schemas.in.h:32
 msgid "If TRUE, Sugar will show a \"Restart\" option."
-msgstr ""
+msgstr "اگر یہ سچ ہے تو، شوگر \"Restart\" کا اختیار دے گا."
 
 #: ../data/sugar.schemas.in.h:33
 msgid ""
@@ -759,13 +909,17 @@ msgstr ""
 msgid "Jabber Server"
 msgstr ""
 
+# کی بورڈ ترتیب
 #: ../data/sugar.schemas.in.h:35
+#, fuzzy
 msgid "Keyboard layouts"
-msgstr ""
+msgstr "کی بورڈ ترتیب"
 
+# کی بورڈ ماڈل
 #: ../data/sugar.schemas.in.h:36
+#, fuzzy
 msgid "Keyboard model"
-msgstr ""
+msgstr "کی بورڈ ماڈل"
 
 #: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
@@ -848,9 +1002,11 @@ msgstr ""
 msgid "User Name"
 msgstr ""
 
+# فونٹ جو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے
 #: ../data/sugar.schemas.in.h:58
+#, fuzzy
 msgid "User name that is used throughout the desktop."
-msgstr ""
+msgstr "فونٹ جو ڈیسک ٹاپ بھر میں استعمال کیا جاتا ہے"
 
 #: ../data/sugar.schemas.in.h:59
 msgid ""
@@ -886,12 +1042,11 @@ msgstr "شوگر-کنٹرول-پينل: کی=%s يہ آپشن موجود نہي�
 #: ../src/jarabe/controlpanel/cmd.py:31
 #, python-format
 msgid "sugar-control-panel: %s"
-msgstr "شوگر-کنٹرول-پينل:%s "
+msgstr "شوگر-کنٹرول-پينل:%s"
 
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
 #: ../src/jarabe/controlpanel/cmd.py:38
-#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -904,40 +1059,31 @@ msgid ""
 "    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"Control for the sugar environment. \n"
-"Options: \n"
-"-h show this help message and exit \n"
-"-l list all the available options \n"
-"-h key show information about this key \n"
-"-g key get the current value of the key \n"
-"-s key set the current value for the key \n"
-"   "
 
 #: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "نئی تبديلیاں عمل میں لانے کے لیے آپ کو شوگر پھر شروع کرنا ہو گا۔\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "دوبارہ چلا کر تبديلياں عمل ميں لائيں"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "تبديلياں ختم کريں"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "بعد ميں"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "ابھی دوبارہ چلائيں"
 
@@ -976,7 +1122,7 @@ msgstr "رکھيں"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "مٹائيں"
@@ -1042,9 +1188,11 @@ msgstr "رجسٹر کريں"
 msgid "Register again"
 msgstr ""
 
+# سافٹ ویئر اپ ڈیٹ
 #: ../src/jarabe/desktop/homebox.py:66
+#, fuzzy
 msgid "Software Update"
-msgstr ""
+msgstr "سافٹ ویئر اپ ڈیٹ"
 
 #: ../src/jarabe/desktop/homebox.py:67
 msgid "Update your activities to ensure compatibility with your new software"
@@ -1070,25 +1218,32 @@ msgstr "پسندیدگان نظارہ"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "اصل قسم:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "اجاذت دينے کی قسم:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 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/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "پھر شروع کريں"
@@ -1098,15 +1253,16 @@ msgstr "پھر شروع کريں"
 msgid "Join"
 msgstr "شرکت کريں"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
-#, python-format, fuzzy
+#: ../src/jarabe/desktop/networkviews.py:636
+#, python-format
+#, python-format,
 msgid "Mesh Network %d"
-msgstr "ميش نيٹ ورک"
+msgstr "ميش نيٹ ورک %d"
 
 #: ../src/jarabe/desktop/schoolserver.py:143
 msgid "Cannot connect to the server."
@@ -1121,20 +1277,26 @@ msgstr ""
 msgid "Decline"
 msgstr "منظور نہیں ہوا"
 
+# %d KB
 #: ../src/jarabe/frame/activitiestray.py:523
 #, python-format
+#, fuzzy
 msgid "%dB"
-msgstr ""
+msgstr "%d KB"
 
+# %d KB
 #: ../src/jarabe/frame/activitiestray.py:525
 #, python-format
+#, python-format, fuzzy
 msgid "%dKB"
-msgstr ""
+msgstr "%d KB"
 
+# %d KB
 #: ../src/jarabe/frame/activitiestray.py:527
 #, python-format
+#, fuzzy
 msgid "%dMB"
-msgstr ""
+msgstr "%d KB"
 
 #: ../src/jarabe/frame/activitiestray.py:544
 #, python-format
@@ -1276,101 +1438,101 @@ msgid "Tags:"
 msgstr ""
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr ""
 
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
 msgstr ""
 
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "شروع کريں"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 2cb47ba..8bf624c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
 "PO-Revision-Date: 2010-03-15 05:42+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,48 +61,48 @@ msgstr "Nhấn chuột để thay đổi màu :"
 msgid "About my Computer"
 msgstr "Giới thiệu máy tính này"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "Không sẵn sàng"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
-msgstr ""
+msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Cá tính"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Số sản xuất:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Phần mềm"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Bản xây dựng:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "Phần vững:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "Phần vững không dây:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "Tác quyền và Giấy phép"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -113,7 +113,7 @@ msgstr ""
 "do, được bao quát bởi Giấy Phép Công Cộng GNU (GPL), thì bạn có quyền sửa "
 "đổi và/hay phân phối lại bản sao nó với các điều kiện GPL."
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "Giấy phép đầy đủ :"
 
@@ -226,11 +226,11 @@ msgstr "Số :"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:130
 msgid "Access Point Name (APN):"
-msgstr ""
+msgstr "Tên điểm truy nhập"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:142
 msgid "Personal Identity Number (PIN):"
-msgstr ""
+msgstr "Số định danh cá nhân (PIN)"
 
 #: ../extensions/cpsection/modemconfiguration/view.py:154
 msgid "Personal Unblocking Key (PUK):"
@@ -241,6 +241,8 @@ msgid ""
 "You will need to provide the following information to set up a mobile "
 "broadband connection to a cellular (3G) network."
 msgstr ""
+"Bạn cần cung cấp các thông tin sau đây để thiết lập kết nối băng rộng di "
+"động tới mạng di động 3G."
 
 #: ../extensions/cpsection/network/__init__.py:21
 #: ../extensions/cpsection/network/view.py:29
@@ -386,9 +388,10 @@ msgid "Download size: %s"
 msgstr "Kích cỡ tải về: %s"
 
 #: ../extensions/cpsection/updater/view.py:364
-#, python-format, fuzzy
+#, python-format
+#, python-format,
 msgid "From version %(current)s to %(new)s (Size: %(size)s)"
-msgstr "Từ phiên bản %(current)d lên %(new)s (Kích cỡ : %(size)s)"
+msgstr "Từ phiên bản %(current)s lên %(new)s (Kích cỡ : %(size)s)"
 
 #. TRANS: download size is 0
 #: ../extensions/cpsection/updater/view.py:382
@@ -444,31 +447,31 @@ msgstr "Địa chỉ IP: %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "Ngắt kết nối"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "Đang kết nối..."
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "Đã kết nối"
 
 #: ../extensions/deviceicon/network.py:130
 msgid "No wireless connection"
-msgstr ""
+msgstr "Không có kết nối không dây"
 
 #: ../extensions/deviceicon/network.py:144
 msgid "Channel"
@@ -491,9 +494,9 @@ msgid "Please wait..."
 msgstr "Hãy đợi..."
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:504
-#: ../src/jarabe/desktop/networkviews.py:637
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "Kết nối"
 
@@ -517,7 +520,7 @@ msgstr ""
 #: ../extensions/deviceicon/network.py:336
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Lỗi: %s"
 
 #: ../extensions/deviceicon/network.py:340
 #, python-format
@@ -531,6 +534,7 @@ msgstr ""
 
 #: ../extensions/deviceicon/network.py:355
 #: ../extensions/deviceicon/network.py:356
+#, python-format
 #, python-format, fuzzy
 msgid "%d KB"
 msgstr "%dKB"
@@ -551,20 +555,21 @@ msgstr ""
 msgid "Check your configuration."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "Mạng mắc lưới"
 
-#: ../extensions/deviceicon/network.py:656
-#, python-format, fuzzy
+#: ../extensions/deviceicon/network.py:659
+#, python-format
+#, python-format,
 msgid "Mesh Network %s"
-msgstr "Mạng mắc lưới %d"
+msgstr "Mạng mắc lưới %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr ""
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr ""
 
@@ -939,26 +944,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Để áp dụng các thay đổi thì cần phải khởi chạy lại pn sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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 "Cảnh báo"
 
-#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "Có thay đổi thì cần phải khởi chạy lại"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "Thôi thay đổi"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "Về sau"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "Khởi chạy lại ngay"
 
@@ -993,7 +998,7 @@ msgstr "Giữ"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "Xoá"
@@ -1090,26 +1095,33 @@ msgstr "Xem Ưa thích"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "Kiểu khoá:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "Cách xác thực:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA và WPA2 Cá nhân"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "Bảo mật Không dây:"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "Tiếp tục"
@@ -1119,12 +1131,12 @@ msgstr "Tiếp tục"
 msgid "Join"
 msgstr "Vào"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr ""
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "Mạng mắc lưới %d"
@@ -1163,9 +1175,10 @@ msgid "%s of %s"
 msgstr "%s trên %s"
 
 #: ../src/jarabe/frame/activitiestray.py:558
-#, python-format, fuzzy
+#, python-format
+#, python-format,
 msgid "Transfer from %s"
-msgstr "Truyền từ %r"
+msgstr "Truyền từ %s"
 
 #: ../src/jarabe/frame/activitiestray.py:569
 msgid "Accept"
@@ -1188,9 +1201,10 @@ msgid "The other participant canceled the file transfer"
 msgstr ""
 
 #: ../src/jarabe/frame/activitiestray.py:691
-#, python-format, fuzzy
+#, python-format
+#, python-format,
 msgid "Transfer to %s"
-msgstr "Truyền tới %r"
+msgstr "Truyền tới %s"
 
 #: ../src/jarabe/frame/clipboardmenu.py:56
 #, fuzzy
@@ -1297,106 +1311,106 @@ msgid "Tags:"
 msgstr "Thẻ:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "Nhật ký"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "Lúc nào"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "Hôm nay"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "Kể từ ngày hôm qua"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "Tuần qua"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "Tháng qua"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "Năm qua"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "Bất cứ ai"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "Bạn bè"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "Cùng lớp"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "Bất cứ gì"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
-msgstr ""
+msgstr "Nhân đôi"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
-msgstr ""
+msgstr "Lỗi"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "Khởi chạy"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr ""
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr ""
 
@@ -1484,7 +1498,7 @@ msgstr ""
 
 #: ../src/jarabe/journal/palettes.py:267
 msgid "Clipboard"
-msgstr ""
+msgstr "Bảng nháp"
 
 #: ../src/jarabe/journal/palettes.py:322
 msgid "No friends present"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 99f802f..9ab6d5b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 00:32-0400\n"
-"PO-Revision-Date: 2012-02-18 08:07+0200\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2012-03-25 07:32+0200\n"
 "Last-Translator: Xin <dram.wang@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
@@ -431,23 +431,23 @@ msgstr "IP 位址：%s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:509
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "断开连接"
 
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:244
-#: ../src/jarabe/desktop/networkviews.py:548
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
 #: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "正在连线…"
 
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:254
-#: ../src/jarabe/desktop/networkviews.py:554
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
 #: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "已连线"
@@ -477,8 +477,8 @@ msgid "Please wait..."
 msgstr "请稍候…"
 
 #: ../extensions/deviceicon/network.py:286
-#: ../src/jarabe/desktop/networkviews.py:136
-#: ../src/jarabe/desktop/networkviews.py:505
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
 #: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "连接"
@@ -537,21 +537,21 @@ msgstr "请检查号码配置。"
 msgid "Check your configuration."
 msgstr "请检查你的配置。"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "网状网络"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 #, python-format,
 msgid "Mesh Network %s"
 msgstr "网状网络 %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "没有可用的GSM连接。"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "在控制面板中创建新的连接。"
 
@@ -869,7 +869,7 @@ msgstr "在恢复模式时，点击一个喜欢的图标上，该活动的最后
 # need %s and %r
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-#, python-format, , fuzzy
+#, python-format, ,
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
@@ -916,26 +916,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "你需要重新启动系统, 让改变生效.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "更改需要重启才能生效"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "取消更改"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "稍后"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "立即重启"
 
@@ -1066,19 +1066,26 @@ msgstr "最爱的视图"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "密钥类型:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "验证类型:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "WPA＆WPA2个人"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "无线安全："
 
@@ -1094,7 +1101,7 @@ msgstr "继续"
 msgid "Join"
 msgstr "加入"
 
-#: ../src/jarabe/desktop/networkviews.py:501
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Ad-hoc网络%d"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 67017ff..86c34dc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -18,16 +18,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-23 11:55-0400\n"
-"PO-Revision-Date: 2011-08-26 20:23+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-24 00:33-0400\n"
+"PO-Revision-Date: 2011-10-31 18:04+0200\n"
+"Last-Translator: Yuan <yuanchao@gmail.com>\n"
 "Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
@@ -73,48 +73,48 @@ msgstr "點選改變顏色"
 msgid "About my Computer"
 msgstr "我的電腦"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:42
+#: ../extensions/cpsection/aboutcomputer/model.py:43
 msgid "Not available"
 msgstr "不存在"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:171
+#: ../extensions/cpsection/aboutcomputer/model.py:183
 #, python-format
 msgid "%(interface)s: %(version)s"
 msgstr "%(interface)s: %(version)s"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:61
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "身份識別"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:70
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "序號"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:92
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "軟體"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:101
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "建立："
 
-#: ../extensions/cpsection/aboutcomputer/view.py:116
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:132
+#: ../extensions/cpsection/aboutcomputer/view.py:129
 msgid "Firmware:"
 msgstr "韌體："
 
-#: ../extensions/cpsection/aboutcomputer/view.py:147
+#: ../extensions/cpsection/aboutcomputer/view.py:144
 msgid "Wireless Firmware:"
 msgstr "無線網路韌體："
 
-#: ../extensions/cpsection/aboutcomputer/view.py:170
+#: ../extensions/cpsection/aboutcomputer/view.py:167
 msgid "Copyright and License"
 msgstr "版權與授權資料"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:188
+#: ../extensions/cpsection/aboutcomputer/view.py:185
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -122,7 +122,7 @@ msgid ""
 "therein."
 msgstr "Sugar 是您目前所看到的使用者界面，Sugar 是一個自由軟體，以 GNU 的 GPL 授權。歡迎您依據授權條例修改與散佈本軟體。"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:200
+#: ../extensions/cpsection/aboutcomputer/view.py:197
 msgid "Full license:"
 msgstr "完整授權條例："
 
@@ -442,8 +442,8 @@ msgstr "網路地址： %s"
 
 #: ../extensions/deviceicon/network.py:104
 #: ../extensions/deviceicon/network.py:303
-#: ../src/jarabe/desktop/networkviews.py:140
-#: ../src/jarabe/desktop/networkviews.py:508
+#: ../src/jarabe/desktop/networkviews.py:141
+#: ../src/jarabe/desktop/networkviews.py:510
 msgid "Disconnect"
 msgstr "切斷連線"
 
@@ -453,18 +453,18 @@ msgstr "切斷連線"
 # have a good mapping
 #: ../extensions/deviceicon/network.py:112
 #: ../extensions/deviceicon/network.py:295
-#: ../src/jarabe/desktop/networkviews.py:243
-#: ../src/jarabe/desktop/networkviews.py:547
-#: ../src/jarabe/desktop/networkviews.py:680
+#: ../src/jarabe/desktop/networkviews.py:245
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:683
 msgid "Connecting..."
 msgstr "連線中…"
 
 # TODO: show the channel number
 #: ../extensions/deviceicon/network.py:117
 #: ../extensions/deviceicon/network.py:185
-#: ../src/jarabe/desktop/networkviews.py:253
-#: ../src/jarabe/desktop/networkviews.py:553
-#: ../src/jarabe/desktop/networkviews.py:686
+#: ../src/jarabe/desktop/networkviews.py:255
+#: ../src/jarabe/desktop/networkviews.py:555
+#: ../src/jarabe/desktop/networkviews.py:689
 msgid "Connected"
 msgstr "已連線"
 
@@ -493,9 +493,9 @@ 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
+#: ../src/jarabe/desktop/networkviews.py:137
+#: ../src/jarabe/desktop/networkviews.py:506
+#: ../src/jarabe/desktop/networkviews.py:639
 msgid "Connect"
 msgstr "連線"
 
@@ -553,20 +553,20 @@ msgstr "檢查撥號號碼"
 msgid "Check your configuration."
 msgstr "檢查你的設定"
 
-#: ../extensions/deviceicon/network.py:612
+#: ../extensions/deviceicon/network.py:615
 msgid "Mesh Network"
 msgstr "網狀網路"
 
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:659
 #, python-format
 msgid "Mesh Network %s"
 msgstr "mesh網路 %s"
 
-#: ../extensions/deviceicon/network.py:779
+#: ../extensions/deviceicon/network.py:782
 msgid "No GSM connection available."
 msgstr "沒有gsm連線"
 
-#: ../extensions/deviceicon/network.py:780
+#: ../extensions/deviceicon/network.py:783
 msgid "Create a connection in the control panel."
 msgstr "在控制台建立新連線"
 
@@ -884,11 +884,11 @@ msgstr "在回復模式下，點選偏好的圖示將回復該活動前一次的
 
 #: ../src/jarabe/controlpanel/cmd.py:28
 #, python-format
-#, python-format, fuzzy
+#, python-format,
 msgid ""
 "sugar-control-panel: WARNING, found more than one option with the same name: "
 "%s module: %r"
-msgstr "Sugar控制台：警告，於模組 %r 中發現重複的選項名稱：%r"
+msgstr "Sugar控制台：警告，於模組 %r 中發現重複的選項名稱：%s"
 
 #: ../src/jarabe/controlpanel/cmd.py:30
 #, python-format
@@ -932,26 +932,26 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "需要重新啟動系統使變更生效.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:296 ../src/jarabe/journal/palettes.py:161
+#: ../src/jarabe/controlpanel/gui.py:297 ../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/gui.py:298
 #: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "改變須要重新啟動才能生效"
 
-#: ../src/jarabe/controlpanel/gui.py:300
+#: ../src/jarabe/controlpanel/gui.py:301
 msgid "Cancel changes"
 msgstr "取消改變"
 
-#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
 msgid "Later"
 msgstr "稍候"
 
-#: ../src/jarabe/controlpanel/gui.py:309
+#: ../src/jarabe/controlpanel/gui.py:310
 msgid "Restart now"
 msgstr "馬上重新啟動"
 
@@ -990,7 +990,7 @@ msgstr "保存"
 
 #: ../src/jarabe/desktop/activitieslist.py:365
 #: ../src/jarabe/desktop/activitieslist.py:419
-#: ../src/jarabe/journal/journaltoolbox.py:398
+#: ../src/jarabe/journal/journaltoolbox.py:413
 #: ../src/jarabe/journal/palettes.py:126
 msgid "Erase"
 msgstr "刪除"
@@ -1087,26 +1087,33 @@ msgstr "偏好檢視"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:143
+#: ../src/jarabe/desktop/keydialog.py:94
+#, python-format
+msgid ""
+"A wireless encryption key is required for\n"
+" the wireless network '%s'."
+msgstr ""
+
+#: ../src/jarabe/desktop/keydialog.py:144
 msgid "Key Type:"
 msgstr "金鑰類型:"
 
-#: ../src/jarabe/desktop/keydialog.py:163
+#: ../src/jarabe/desktop/keydialog.py:164
 msgid "Authentication Type:"
 msgstr "認證類型:"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:230
 msgid "WPA & WPA2 Personal"
 msgstr "個人的 WPA & WPA2 加密"
 
-#: ../src/jarabe/desktop/keydialog.py:238
+#: ../src/jarabe/desktop/keydialog.py:239
 msgid "Wireless Security:"
 msgstr "無線網路加密："
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
 #: ../src/jarabe/desktop/meshbox.py:91
-#: ../src/jarabe/journal/journaltoolbox.py:494
+#: ../src/jarabe/journal/journaltoolbox.py:509
 #: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
 msgid "Resume"
 msgstr "回復"
@@ -1116,12 +1123,12 @@ msgstr "回復"
 msgid "Join"
 msgstr "加入"
 
-#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:502
 #, python-format
 msgid "Ad-hoc Network %d"
 msgstr "Ad-hoc 網路 %d"
 
-#: ../src/jarabe/desktop/networkviews.py:634
+#: ../src/jarabe/desktop/networkviews.py:636
 #, python-format
 msgid "Mesh Network %d"
 msgstr "網狀網路 %d"
@@ -1183,7 +1190,7 @@ msgstr "拒絕"
 
 #: ../src/jarabe/frame/activitiestray.py:643
 msgid "The other participant canceled the file transfer"
-msgstr ""
+msgstr "對方已取消檔案傳輸"
 
 #: ../src/jarabe/frame/activitiestray.py:691
 #, python-format
@@ -1192,7 +1199,6 @@ msgid "Transfer to %s"
 msgstr "傳送給 %s"
 
 #: ../src/jarabe/frame/clipboardmenu.py:56
-#, fuzzy
 msgctxt "Clipboard"
 msgid "Remove"
 msgstr "移除"
@@ -1296,81 +1302,81 @@ msgid "Tags:"
 msgstr "標籤:"
 
 #: ../src/jarabe/journal/journalactivity.py:115
-#: ../src/jarabe/journal/journaltoolbox.py:453
+#: ../src/jarabe/journal/journaltoolbox.py:468
 #: ../src/jarabe/journal/palettes.py:198
 #: ../src/jarabe/journal/volumestoolbar.py:368
 msgid "Journal"
 msgstr "日誌"
 
-#: ../src/jarabe/journal/journaltoolbox.py:71
+#: ../src/jarabe/journal/journaltoolbox.py:72
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/jarabe/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:139
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../src/jarabe/journal/journaltoolbox.py:140
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Today"
 msgstr "今天"
 
-#: ../src/jarabe/journal/journaltoolbox.py:142
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "Since yesterday"
 msgstr "一天內"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:144
+#: ../src/jarabe/journal/journaltoolbox.py:145
 msgid "Past week"
 msgstr "一週內"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:147
 msgid "Past month"
 msgstr "一個月內"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:148
+#: ../src/jarabe/journal/journaltoolbox.py:149
 msgid "Past year"
 msgstr "一年內"
 
-#: ../src/jarabe/journal/journaltoolbox.py:155
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../src/jarabe/journal/journaltoolbox.py:157
+#: ../src/jarabe/journal/journaltoolbox.py:158
 msgid "My friends"
 msgstr "我的好友"
 
-#: ../src/jarabe/journal/journaltoolbox.py:158
+#: ../src/jarabe/journal/journaltoolbox.py:159
 msgid "My class"
 msgstr "我的類別"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:300
+#: ../src/jarabe/journal/journaltoolbox.py:301
 msgid "Anything"
 msgstr "所有類別"
 
-#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/journaltoolbox.py:396
 #: ../src/jarabe/journal/palettes.py:93
 msgid "Copy to"
 msgstr "複製給"
 
-#: ../src/jarabe/journal/journaltoolbox.py:389
+#: ../src/jarabe/journal/journaltoolbox.py:404
 #: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
 msgid "Duplicate"
 msgstr "副本"
 
-#: ../src/jarabe/journal/journaltoolbox.py:422
+#: ../src/jarabe/journal/journaltoolbox.py:437
 #: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
 #: ../src/jarabe/journal/volumestoolbar.py:315
 #, python-format
 msgid "Error while copying the entry. %s"
 msgstr "複製檔案（%s）時發生錯誤"
 
-#: ../src/jarabe/journal/journaltoolbox.py:423
+#: ../src/jarabe/journal/journaltoolbox.py:438
 #: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
 #: ../src/jarabe/journal/volumestoolbar.py:316
 msgid "Error"
@@ -1378,24 +1384,24 @@ msgstr "錯誤"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:497
+#: ../src/jarabe/journal/journaltoolbox.py:512
 #: ../src/jarabe/journal/palettes.py:74
 msgid "Start"
 msgstr "啟動"
 
-#: ../src/jarabe/journal/journaltoolbox.py:525
+#: ../src/jarabe/journal/journaltoolbox.py:540
 msgid "Sort by date modified"
 msgstr "以日期變更來排序"
 
-#: ../src/jarabe/journal/journaltoolbox.py:526
+#: ../src/jarabe/journal/journaltoolbox.py:541
 msgid "Sort by date created"
 msgstr "以建立日期來排序"
 
-#: ../src/jarabe/journal/journaltoolbox.py:527
+#: ../src/jarabe/journal/journaltoolbox.py:542
 msgid "Sort by size"
 msgstr "以大小排序"
 
-#: ../src/jarabe/journal/journaltoolbox.py:536
+#: ../src/jarabe/journal/journaltoolbox.py:551
 msgid "Sort view"
 msgstr "以檢視來排序"
 
@@ -1405,11 +1411,11 @@ msgstr "空白的日誌內容"
 
 #: ../src/jarabe/journal/listview.py:319
 msgid "Your documents folder is empty"
-msgstr ""
+msgstr "空白的文件夾"
 
 #: ../src/jarabe/journal/listview.py:321
 msgid "The device is empty"
-msgstr ""
+msgstr "設備中無資料"
 
 #: ../src/jarabe/journal/listview.py:323
 msgid "No matching entries"
@@ -1732,7 +1738,6 @@ msgid "Show contents"
 msgstr "顯示內容"
 
 #: ../src/jarabe/view/palettes.py:229
-#, fuzzy
 msgctxt "Volume"
 msgid "Remove"
 msgstr "移除"