Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

4 files changed, 175 insertions, 86 deletions

diff --git a/po/ar.po b/po/ar.po
index ac10c67..5978dcf 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-23 07:44-0400\n"
-"PO-Revision-Date: 2008-07-30 05:23-0400\n"
+"POT-Creation-Date: 2008-09-01 18:31-0400\n"
+"PO-Revision-Date: 2008-09-01 19:07-0400\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,23 +19,23 @@ msgstr ""
 "Nplurals=6; Plural=N==0 ? 0: n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 "
 ": n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
+#: ../src/intro/window.py:93 ../src/controlpanel/view/aboutme.py:100
 msgid "Name:"
 msgstr "الاسم:"
 
-#: ../src/intro/intro.py:94
+#: ../src/intro/window.py:125
 msgid "Click to change color:"
 msgstr "انقر لتغيير اللون:"
 
-#: ../src/intro/intro.py:145
+#: ../src/intro/window.py:175
 msgid "Back"
 msgstr "السابق"
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
 msgid "Done"
 msgstr "تمّ"
 
-#: ../src/intro/intro.py:162
+#: ../src/intro/window.py:192
 msgid "Next"
 msgstr "التالي"
 
@@ -47,7 +47,7 @@ msgstr "أزل صديق"
 msgid "Make friend"
 msgstr "اصنع صديق"
 
-#: ../src/view/BuddyMenu.py:91
+#: ../src/view/BuddyMenu.py:90
 #, python-format
 msgid "Invite to %s"
 msgstr "ادعُ إلى %s"
@@ -68,7 +68,7 @@ msgstr "افتح"
 #. TODO: Implement stopping downloads
 #. self._stop_item.connect('activate', self._stop_item_activate_cb)
 #. self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:86
+#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:87
 msgid "Keep"
 msgstr "احفظ"
 
@@ -93,48 +93,80 @@ msgstr "نوع الاستيثاق:"
 msgid "Encryption Type:"
 msgstr "نوع التعمية:"
 
-#: ../src/view/Shell.py:240
+#: ../src/hardware/schoolserver.py:17
+msgid "Cannot obtain data needed for registration."
+msgstr "تعذّر الحصول على البيانات المطلوبة للتسجيل."
+
+#: ../src/hardware/schoolserver.py:31
+msgid "Cannot connect to the server."
+msgstr "تعذّر الاتصال بالخادوم."
+
+#: ../src/hardware/schoolserver.py:36
+msgid "The server could not complete the request."
+msgstr "لم يستطع الخادوم إكمال الطلب."
+
+#: ../src/view/Shell.py:261
 msgid "Screenshot"
 msgstr "لقطة شاشة"
 
-#: ../src/view/home/HomeBox.py:80
+#: ../src/view/home/HomeBox.py:81
 msgid "Confirm erase"
 msgstr "أكّد المسح"
 
-#: ../src/view/home/HomeBox.py:82
+#: ../src/view/home/HomeBox.py:83
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "أكّد المسح: أتريد مسح %s نهائيا؟"
 
-#: ../src/view/home/HomeBox.py:89 ../src/view/palettes.py:120
+#: ../src/view/home/HomeBox.py:90 ../src/view/palettes.py:120
 msgid "Erase"
 msgstr "امسح"
 
-#: ../src/view/home/HomeBox.py:215
+#: ../src/view/home/HomeBox.py:120
+msgid "Software Update"
+msgstr "تحديث البرمجيات"
+
+#: ../src/view/home/HomeBox.py:121
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr "حدّث نشاطاتك لتضمن التوافقية مع البرمجيات الجديدة"
+
+#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/toolbar.py:115
+msgid "Cancel"
+msgstr "ألغِ"
+
+#: ../src/view/home/HomeBox.py:127 ../src/controlpanel/gui.py:276
+msgid "Later"
+msgstr "لاحقا"
+
+#: ../src/view/home/HomeBox.py:130
+msgid "Check now"
+msgstr "التمس الآن"
+
+#: ../src/view/home/HomeBox.py:266
 msgid "List view"
 msgstr "منظور القائمة"
 
-#: ../src/view/home/HomeBox.py:216
+#: ../src/view/home/HomeBox.py:267
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/view/home/HomeBox.py:273
+#: ../src/view/home/HomeBox.py:325
 msgid "Favorites view"
 msgstr "المنظور المفضل"
 
-#: ../src/view/home/HomeBox.py:274
+#: ../src/view/home/HomeBox.py:326
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
 # TRANS: label for the freeform layout in the favorites view
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:282
+#: ../src/view/home/HomeBox.py:334
 msgid "Freeform"
 msgstr "حُر"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:289
+#: ../src/view/home/HomeBox.py:341
 msgid "Ring"
 msgstr "حلقة"
 
@@ -212,11 +244,11 @@ msgstr "مشحون"
 msgid "My Speakers"
 msgstr "سماعاتي"
 
-#: ../src/view/devices/speaker.py:119
+#: ../src/view/devices/speaker.py:125
 msgid "Unmute"
 msgstr "افتح"
 
-#: ../src/view/devices/speaker.py:122
+#: ../src/view/devices/speaker.py:128
 msgid "Mute"
 msgstr "أصمِت"
 
@@ -228,19 +260,19 @@ msgstr "مفصول"
 msgid "Channel"
 msgstr "قناة"
 
-#: ../src/view/frame/zoomtoolbar.py:34
+#: ../src/view/frame/zoomtoolbar.py:37
 msgid "Neighborhood"
 msgstr "الجِوَار"
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../src/view/frame/zoomtoolbar.py:39
 msgid "Group"
 msgstr "المجموعة"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../src/view/frame/zoomtoolbar.py:41
 msgid "Home"
 msgstr "المنزل"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../src/view/frame/zoomtoolbar.py:43
 msgid "Activity"
 msgstr "النشاط"
 
@@ -261,7 +293,9 @@ msgstr ""
 msgid "sugar-control-panel: %s"
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/controlpanel/cmd.py:35
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -271,38 +305,31 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/controlpanel/cmd.py:48
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "تحتاج لإعادة تشغيل «سُكّر» لتُطبق التغييرات.\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "ألغِ"
-
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:294
+#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:296
 msgid "Ok"
 msgstr "حسنا"
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:260
+#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:268
 msgid "Changes require restart"
 msgstr "تتطلب التغييرات إعادة التشغيل"
 
-#: ../src/controlpanel/gui.py:259
+#: ../src/controlpanel/gui.py:267
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../src/controlpanel/gui.py:263
+#: ../src/controlpanel/gui.py:271
 msgid "Cancel changes"
 msgstr "ألغِ التغييرات"
 
-#: ../src/controlpanel/gui.py:267
-msgid "Later"
-msgstr "لاحقا"
-
-#: ../src/controlpanel/gui.py:271
+#: ../src/controlpanel/gui.py:280
 msgid "Restart now"
 msgstr "أعِد التشغيل الآن"
 
@@ -354,12 +381,12 @@ msgstr "يجب أن تكون القيمة عددا صحيحا."
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "تعذّر الوصول إلى ‭~/.i18n‬. سأنشئ إعدادات قياسية."
 
-#: ../src/controlpanel/model/language.py:104
+#: ../src/controlpanel/model/language.py:110
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "لا يمكن تحديد لغة الرمز=%s."
 
-#: ../src/controlpanel/model/language.py:121
+#: ../src/controlpanel/model/language.py:127
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "آسف، لا أتحدث '%s'."
@@ -392,30 +419,58 @@ msgstr "عنّي"
 msgid "Click to change your color:"
 msgstr "انقر لتغيير اللون:"
 
-#: ../src/controlpanel/view/aboutxo.py:26
+#: ../src/controlpanel/view/aboutxo.py:28
 msgid "About my XO"
 msgstr "عن حاسوبي"
 
-#: ../src/controlpanel/view/aboutxo.py:47
+#: ../src/controlpanel/view/aboutxo.py:59
 msgid "Identity"
 msgstr "المعرّف"
 
-#: ../src/controlpanel/view/aboutxo.py:56
+#: ../src/controlpanel/view/aboutxo.py:68
 msgid "Serial Number:"
 msgstr "الرقم التسلسلي"
 
-#: ../src/controlpanel/view/aboutxo.py:79
+#: ../src/controlpanel/view/aboutxo.py:91
 msgid "Software"
 msgstr "البرمجيات"
 
-#: ../src/controlpanel/view/aboutxo.py:88
+#: ../src/controlpanel/view/aboutxo.py:100
 msgid "Build:"
 msgstr "البناء:"
 
-#: ../src/controlpanel/view/aboutxo.py:103
+#: ../src/controlpanel/view/aboutxo.py:115
+msgid "Sugar:"
+msgstr "سُكّر:"
+
+#: ../src/controlpanel/view/aboutxo.py:130
 msgid "Firmware:"
 msgstr "البرمجيات الثابتة (Firmware):"
 
+#: ../src/controlpanel/view/aboutxo.py:152
+msgid "Copyright and License"
+msgstr "حقوق النشر والترخيص"
+
+#: ../src/controlpanel/view/aboutxo.py:160
+msgid ""
+"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+msgstr "حقوق النشر محفوظة 2008 لجمعية حاسوب محمول لكل طفل؛ ردهات؛ والمساهمين."
+
+#: ../src/controlpanel/view/aboutxo.py:166
+msgid ""
+"Sugar is the graphical user interface that you are looking at. Sugar is free "
+"software, covered by the GNU General Public License, and you are welcome to "
+"change it and/or distribute copies of it under certain conditions described "
+"therein."
+msgstr ""
+"سُكّر هي واجهة المستخدم الرسومية التي تنظر لها الآن. سُكّر برمجية حرّة تخضع "
+"لرخصة جنو للتأميم عامّة الأغراض، ويمكنك تعديلها و/أو توزيع نسخ منها وفق شروط "
+"معينة مذكورة هنا."
+
+#: ../src/controlpanel/view/aboutxo.py:178
+msgid "Full license:"
+msgstr "الترخيص كاملا:"
+
 #: ../src/controlpanel/view/datetime.py:29
 msgid "Date & Time"
 msgstr "التاريخ والوقت"
@@ -492,7 +547,7 @@ msgstr "إدارة آلية للطاقة (تطيل من عمر البطارية)
 
 #: ../src/controlpanel/view/power.py:89
 msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
+"Extreme power management (disableswireless radio, increases battery life)"
 msgstr "إدارة قصوى للطاقة (تعطّل اللاسلكي وتطيل عمر البطارية)"
 
 #: ../src/view/devices/network/mesh.py:111
@@ -527,36 +582,36 @@ msgstr "شبكة مجهولة"
 msgid "Decline"
 msgstr "ارفض"
 
-#: ../src/view/home/favoritesview.py:285
+#: ../src/view/home/favoritesview.py:286
 msgid "Registration Failed"
 msgstr "فشل التسجيل"
 
-#: ../src/view/home/favoritesview.py:286
+#: ../src/view/home/favoritesview.py:287
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/view/home/favoritesview.py:288
+#: ../src/view/home/favoritesview.py:289
 msgid "Registration Successful"
 msgstr "نجح التسجيل"
 
-#: ../src/view/home/favoritesview.py:289
+#: ../src/view/home/favoritesview.py:290
 msgid "You are now registered with your school server."
 msgstr "الآن، أنت مسجّل في خادوم مدرستك."
 
-#: ../src/view/home/favoritesview.py:405
+#: ../src/view/home/favoritesview.py:407
 msgid "Control Panel"
 msgstr "لوحة التحكم"
 
-#: ../src/view/home/favoritesview.py:416
+#: ../src/view/home/favoritesview.py:418
 msgid "Restart"
 msgstr "أعد التشغيل"
 
-#: ../src/view/home/favoritesview.py:421
+#: ../src/view/home/favoritesview.py:423
 msgid "Shutdown"
 msgstr "أطفئ"
 
-#: ../src/view/home/favoritesview.py:427
+#: ../src/view/home/favoritesview.py:429
 msgid "Register"
 msgstr "سجّل"
 
diff --git a/po/fr.po b/po/fr.po
index c437242..417733d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-29 00:30-0400\n"
-"PO-Revision-Date: 2008-09-01 09:29-0400\n"
+"POT-Creation-Date: 2008-09-01 18:31-0400\n"
+"PO-Revision-Date: 2008-09-01 19:38-0400\n"
 "Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr "Retirer de mes amis"
 msgid "Make friend"
 msgstr "Ajouter à mes amis"
 
-#: ../src/view/BuddyMenu.py:91
+#: ../src/view/BuddyMenu.py:90
 #, python-format
 msgid "Invite to %s"
 msgstr "Inviter à %s"
@@ -101,7 +101,7 @@ msgstr "Impossible de se connecter au serveur."
 msgid "The server could not complete the request."
 msgstr "Le serveur n'a pas pu achever la requête."
 
-#: ../src/view/Shell.py:253
+#: ../src/view/Shell.py:261
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
@@ -149,23 +149,23 @@ msgstr "Écran liste"
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/view/home/HomeBox.py:324
+#: ../src/view/home/HomeBox.py:325
 msgid "Favorites view"
 msgstr "Écran favoris"
 
-#: ../src/view/home/HomeBox.py:325
+#: ../src/view/home/HomeBox.py:326
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
 # TRANS: label for the freeform layout in the favorites view
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:333
+#: ../src/view/home/HomeBox.py:334
 msgid "Freeform"
 msgstr "Libre"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:340
+#: ../src/view/home/HomeBox.py:341
 msgid "Ring"
 msgstr "Concentrique"
 
@@ -462,15 +462,25 @@ msgid "Copyright and License"
 msgstr "Copyright et licence"
 
 #: ../src/controlpanel/view/aboutxo.py:160
-msgid "© 2008 One Laptop per Child Assocation "
-msgstr "© 2008 One Laptop per Child Assocation "
+msgid ""
+"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+msgstr ""
+"© 2008 One Laptop per Child Association Inc ; Red Hat Inc ; et "
+"contributeurs."
 
 #: ../src/controlpanel/view/aboutxo.py:166
-#, fuzzy
-msgid "Sugar is the graphical user interface that "
-msgstr "Sugar est l'interface utilisateur graphique que"
+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 est l'interface graphique utilisateur que vous utilisez actuellement. "
+"Sugar est un logiciel libre couvert par la licence GNU/GPL (General Public "
+"License). Vous êtes autorisé à le modifier et/ou à en distribuer des copies "
+"aux conditions spécifiées."
 
-#: ../src/controlpanel/view/aboutxo.py:177
+#: ../src/controlpanel/view/aboutxo.py:178
 msgid "Full license:"
 msgstr "Licence complète :"
 
@@ -649,6 +659,13 @@ msgstr "Afficher les contenus"
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d Mo de libre"
 
+#~ msgid "© 2008 One Laptop per Child Assocation "
+#~ msgstr "© 2008 One Laptop per Child Assocation "
+
+#, fuzzy
+#~ msgid "Sugar is the graphical user interface that "
+#~ msgstr "Sugar est l'interface utilisateur graphique que"
+
 #~ msgid "<Ctrl>R"
 #~ msgstr "<Ctrl>R"
 
diff --git a/po/it.po b/po/it.po
index 939ca2a..e475f24 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-29 00:30-0400\n"
-"PO-Revision-Date: 2008-09-01 06:02-0400\n"
+"POT-Creation-Date: 2008-09-01 18:31-0400\n"
+"PO-Revision-Date: 2008-09-02 04:40-0400\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr "Rimuovi l'amico"
 msgid "Make friend"
 msgstr "Aggiungi agli amici"
 
-#: ../src/view/BuddyMenu.py:91
+#: ../src/view/BuddyMenu.py:90
 #, python-format
 msgid "Invite to %s"
 msgstr "Invito per %s"
@@ -101,7 +101,7 @@ msgstr "Impossibile connettersi al server."
 msgid "The server could not complete the request."
 msgstr "Il server non può completare la richiesta."
 
-#: ../src/view/Shell.py:253
+#: ../src/view/Shell.py:261
 msgid "Screenshot"
 msgstr "Schermata"
 
@@ -149,23 +149,23 @@ msgstr "Vista Elenco"
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/view/home/HomeBox.py:324
+#: ../src/view/home/HomeBox.py:325
 msgid "Favorites view"
 msgstr "Visualizza i Preferiti"
 
-#: ../src/view/home/HomeBox.py:325
+#: ../src/view/home/HomeBox.py:326
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
 # TRANS: label for the freeform layout in the favorites view
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:333
+#: ../src/view/home/HomeBox.py:334
 msgid "Freeform"
 msgstr "Formato libero"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:340
+#: ../src/view/home/HomeBox.py:341
 msgid "Ring"
 msgstr "Anello"
 
@@ -466,14 +466,24 @@ msgid "Copyright and License"
 msgstr "Copyright e Licenza"
 
 #: ../src/controlpanel/view/aboutxo.py:160
-msgid "© 2008 One Laptop per Child Assocation "
-msgstr "© 2008 One Laptop per Child Association "
+msgid ""
+"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+msgstr ""
+"© 2008 One Laptop per Child Association Inc; Red Hat Inc; e Contributori."
 
 #: ../src/controlpanel/view/aboutxo.py:166
-msgid "Sugar is the graphical user interface that "
-msgstr "Sugar è l'interfaccia grafica utente che "
+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 è l'interfaccia utente che stai utilizzando in questo istante. Sugar è "
+"Software Libero, protetto dalla licenza General Public License di GNU, e "
+"chiunque è il benvenuto per apportare modifiche e migliorie e/o distribuirne "
+"copie, alle condizioni descritte nella licenza medesima."
 
-#: ../src/controlpanel/view/aboutxo.py:177
+#: ../src/controlpanel/view/aboutxo.py:178
 msgid "Full license:"
 msgstr "Testo della Licenza:"
 
@@ -656,6 +666,12 @@ msgstr "Mostra i contenuti"
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d MB Liberi"
 
+#~ msgid "© 2008 One Laptop per Child Assocation "
+#~ msgstr "© 2008 One Laptop per Child Association "
+
+#~ msgid "Sugar is the graphical user interface that "
+#~ msgstr "Sugar è l'interfaccia grafica utente che "
+
 #~ msgid "<Ctrl>R"
 #~ msgstr "<Ctrl>R"
 
diff --git a/src/controlpanel/view/aboutxo.py b/src/controlpanel/view/aboutxo.py
index 6db7176..4c1d299 100644
--- a/src/controlpanel/view/aboutxo.py
+++ b/src/controlpanel/view/aboutxo.py
@@ -157,8 +157,9 @@ class AboutXO(SectionView):
         vbox_copyright.set_border_width(style.DEFAULT_SPACING * 2)
         vbox_copyright.set_spacing(style.DEFAULT_SPACING)
 
-        label_copyright = gtk.Label(_("© 2008 One Laptop per Child Association "
-                                      "Inc; Red Hat Inc; and Contributors."))
+        label_copyright = gtk.Label(_("© 2008 One Laptop per Child "
+                                      "Association Inc; Red Hat Inc; "
+                                      "and Contributors."))
         label_copyright.set_alignment(0, 0)
         label_copyright.show()
         vbox_copyright.pack_start(label_copyright, expand=False)