1
diff --git a/po/ar.po b/po/ar.po
2
index 5978dcf..7d9d03d 100644
6
# translation of sugar.po to Arabic
7
-# Khaled Hosny <khaledhosny@eglug.org>, 2007, 2008.
8
+# Khaled Hosny <khaledhosny@eglug.org>, 2007, 2008, 2009.
9
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
10
# This file is distributed under the same license as the PACKAGE package.
13
"Project-Id-Version: sugar\n"
14
"Report-Msgid-Bugs-To: \n"
15
-"POT-Creation-Date: 2008-09-01 18:31-0400\n"
16
-"PO-Revision-Date: 2008-09-01 19:07-0400\n"
17
+"POT-Creation-Date: 2009-04-29 17:36-0400\n"
18
+"PO-Revision-Date: 2009-08-28 20:46+0300\n"
19
"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
20
"Language-Team: Arabic <doc@arabeyes.org>\n"
23
"Content-Type: text/plain; charset=UTF-8\n"
24
"Content-Transfer-Encoding: 8bit\n"
25
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
26
-"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
27
-"X-Generator: Pootle 1.1.0rc2\n"
28
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
29
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
30
+"X-Generator: Virtaal 0.4.0\n"
31
"Nplurals=6; Plural=N==0 ? 0: n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 "
32
": n%100>=11 && n%100<=99 ? 4 : 5;\n"
34
-#: ../src/intro/window.py:93 ../src/controlpanel/view/aboutme.py:100
37
+#: ../extensions/cpsection/aboutme/__init__.py:24
41
-#: ../src/intro/window.py:125
42
-msgid "Click to change color:"
43
-msgstr "انقر لتغيير اللون:"
45
-#: ../src/intro/window.py:175
49
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
53
-#: ../src/intro/window.py:192
57
-#: ../src/view/BuddyMenu.py:58
58
-msgid "Remove friend"
61
-#: ../src/view/BuddyMenu.py:61
65
-#: ../src/view/BuddyMenu.py:90
70
-#: ../src/view/clipboardmenu.py:48
74
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
78
-# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
79
-# TODO: Implement stopping downloads
80
-# self._stop_item.connect('activate', self._stop_item_activate_cb)
81
-# self.append_menu_item(self._stop_item)
82
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
83
-#. TODO: Implement stopping downloads
84
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
85
-#. self.append_menu_item(self._stop_item)
86
-#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:87
90
-#: ../src/view/clipboardmenu.py:84
92
-msgstr "افتح باستخدام"
94
-#: ../src/view/clipboardmenu.py:216
96
-msgid "Clipboard object: %s."
97
-msgstr "عنصر الحافظة: %s."
99
-#: ../src/hardware/keydialog.py:150
101
-msgstr "نوع المفتاح:"
103
-#: ../src/hardware/keydialog.py:170
104
-msgid "Authentication Type:"
105
-msgstr "نوع الاستيثاق:"
107
-#: ../src/hardware/keydialog.py:251
108
-msgid "Encryption Type:"
109
-msgstr "نوع التعمية:"
111
-#: ../src/hardware/schoolserver.py:17
112
-msgid "Cannot obtain data needed for registration."
113
-msgstr "تعذّر الحصول على البيانات المطلوبة للتسجيل."
115
-#: ../src/hardware/schoolserver.py:31
116
-msgid "Cannot connect to the server."
117
-msgstr "تعذّر الاتصال بالخادوم."
119
-#: ../src/hardware/schoolserver.py:36
120
-msgid "The server could not complete the request."
121
-msgstr "لم يستطع الخادوم إكمال الطلب."
123
-#: ../src/view/Shell.py:261
127
-#: ../src/view/home/HomeBox.py:81
128
-msgid "Confirm erase"
131
-#: ../src/view/home/HomeBox.py:83
133
-msgid "Confirm erase: Do you want to permanently erase %s?"
134
-msgstr "أكّد المسح: أتريد مسح %s نهائيا؟"
136
-#: ../src/view/home/HomeBox.py:90 ../src/view/palettes.py:120
140
-#: ../src/view/home/HomeBox.py:120
141
-msgid "Software Update"
142
-msgstr "تحديث البرمجيات"
144
-#: ../src/view/home/HomeBox.py:121
145
-msgid "Update your activities to ensure compatibility with your new software"
146
-msgstr "حدّث نشاطاتك لتضمن التوافقية مع البرمجيات الجديدة"
148
-#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/toolbar.py:115
152
-#: ../src/view/home/HomeBox.py:127 ../src/controlpanel/gui.py:276
156
-#: ../src/view/home/HomeBox.py:130
160
-#: ../src/view/home/HomeBox.py:266
162
-msgstr "منظور القائمة"
164
-#: ../src/view/home/HomeBox.py:267
168
-#: ../src/view/home/HomeBox.py:325
169
-msgid "Favorites view"
170
-msgstr "المنظور المفضل"
172
-#: ../src/view/home/HomeBox.py:326
176
-# TRANS: label for the freeform layout in the favorites view
177
-#. TRANS: label for the freeform layout in the favorites view
178
-#: ../src/view/home/HomeBox.py:334
182
-# TRANS: label for the ring layout in the favorites view
183
-#. TRANS: label for the ring layout in the favorites view
184
-#: ../src/view/home/HomeBox.py:341
188
-#: ../src/view/home/MeshBox.py:97
192
-#: ../src/view/home/MeshBox.py:106
194
-msgstr "اقطع الاتصال"
196
-# Only show disconnect when there's a mesh device, because mesh takes
197
-# priority over the normal wireless device. NM doesn't have a "disconnect"
198
-# method for a device either (for various reasons) so this doesn't
199
-# have a good mapping
200
-#: ../src/view/home/MeshBox.py:118
201
-msgid "Disconnecting..."
202
-msgstr "يجري قطع الاتصال..."
204
-#: ../src/view/home/MeshBox.py:152
205
-msgid "Connecting..."
206
-msgstr "يجري الاتصال..."
208
-# TODO: show the channel number
209
-#. TODO: show the channel number
210
-#: ../src/view/home/MeshBox.py:159
214
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:41
215
-#: ../src/view/devices/network/mesh.py:68
216
-#: ../src/view/devices/network/mesh.py:72
217
-msgid "Mesh Network"
218
-msgstr "شبكة عُروِيّة"
220
-# Only show disconnect when there's a mesh device, because mesh takes
221
-# priority over the normal wireless device. NM doesn't have a "disconnect"
222
-# method for a device either (for various reasons) so this doesn't
223
-# have a good mapping
224
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:119
225
-#: ../src/view/devices/network/mesh.py:89
226
-msgid "Disconnect..."
229
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:61
233
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:205
237
-#: ../src/view/devices/battery.py:45
241
-#: ../src/view/devices/battery.py:114
245
-#: ../src/view/devices/battery.py:117
246
-msgid "Very little power remaining"
247
-msgstr "بقي القليل جدا من الطاقة"
249
-#: ../src/view/devices/battery.py:123
251
-msgid "%(hour)d:%(min).2d remaining"
252
-msgstr "باقي %(hour)d:%(min).2d"
254
-#: ../src/view/devices/battery.py:127
258
-#: ../src/view/devices/speaker.py:44
262
-#: ../src/view/devices/speaker.py:125
266
-#: ../src/view/devices/speaker.py:128
270
-#: ../src/view/devices/network/wireless.py:67
271
-msgid "Disconnected"
274
-#: ../src/view/devices/network/wireless.py:137
278
-#: ../src/view/frame/zoomtoolbar.py:37
279
-msgid "Neighborhood"
282
-#: ../src/view/frame/zoomtoolbar.py:39
286
-#: ../src/view/frame/zoomtoolbar.py:41
290
-#: ../src/view/frame/zoomtoolbar.py:43
294
-#: ../src/controlpanel/cmd.py:26
297
-"sugar-control-panel: WARNING, found more than one option with the same name: "
301
-#: ../src/controlpanel/cmd.py:28
303
-msgid "sugar-control-panel: key=%s not an available option"
306
-#: ../src/controlpanel/cmd.py:29
308
-msgid "sugar-control-panel: %s"
311
-#. TRANS: Translators, there's a empty line at the end of this string,
312
-#. which must appear in the translated string (msgstr) as well.
313
-#: ../src/controlpanel/cmd.py:35
315
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
316
-" Control for the sugar environment. \n"
318
-" -h show this help message and exit \n"
319
-" -l list all the available options \n"
320
-" -h key show information about this key \n"
321
-" -g key get the current value of the key \n"
322
-" -s key set the current value for the key \n"
323
-" -c key clear the current value for the key \n"
327
-#: ../src/controlpanel/cmd.py:48
328
-msgid "To apply your changes you have to restart sugar.\n"
329
-msgstr "تحتاج لإعادة تشغيل «سُكّر» لتُطبق التغييرات.\n"
331
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:296
335
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:268
336
-msgid "Changes require restart"
337
-msgstr "تتطلب التغييرات إعادة التشغيل"
339
-#: ../src/controlpanel/gui.py:267
343
-#: ../src/controlpanel/gui.py:271
344
-msgid "Cancel changes"
345
-msgstr "ألغِ التغييرات"
347
-#: ../src/controlpanel/gui.py:280
349
-msgstr "أعِد التشغيل الآن"
351
-#: ../src/controlpanel/model/aboutme.py:44
352
+#: ../extensions/cpsection/aboutme/model.py:43
353
msgid "You must enter a name."
354
msgstr "يجب أن تُدخِل اسما."
356
-#: ../src/controlpanel/model/aboutme.py:69
357
+#: ../extensions/cpsection/aboutme/model.py:68
359
msgid "stroke: color=%s hue=%s"
360
msgstr "الحواف: اللون=%s التشبع=%s"
362
-#: ../src/controlpanel/model/aboutme.py:72
363
+#: ../extensions/cpsection/aboutme/model.py:71
368
-#: ../src/controlpanel/model/aboutme.py:74
369
+#: ../extensions/cpsection/aboutme/model.py:73
371
msgid "fill: color=%s hue=%s"
372
msgstr "الملء: اللون=%s التشبع=%s"
374
-#: ../src/controlpanel/model/aboutme.py:76
375
+#: ../extensions/cpsection/aboutme/model.py:75
380
-#: ../src/controlpanel/model/aboutme.py:87
381
+#: ../extensions/cpsection/aboutme/model.py:86
382
msgid "Error in specified color modifiers."
383
msgstr "خطأ في مُغيّرات الألوان المحددة."
385
-#: ../src/controlpanel/model/aboutme.py:90
386
+#: ../extensions/cpsection/aboutme/model.py:89
387
msgid "Error in specified colors."
388
msgstr "خطأ في الألوان المحددة."
390
-#: ../src/controlpanel/model/aboutxo.py:24
391
-msgid "Not available"
393
+#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
397
-#: ../src/controlpanel/model/datetime.py:85
398
-msgid "Error timezone does not exist."
399
-msgstr "خطأ: المنطقة الزمنية لا وجود لها."
401
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
402
-msgid "Value must be an integer."
403
-msgstr "يجب أن تكون القيمة عددا صحيحا."
405
-#: ../src/controlpanel/model/language.py:28
406
-msgid "Could not access ~/.i18n. Create standard settings."
407
-msgstr "تعذّر الوصول إلى ~/.i18n. سأنشئ إعدادات قياسية."
409
-#: ../src/controlpanel/model/language.py:110
411
-msgid "Language for code=%s could not be determined."
412
-msgstr "لا يمكن تحديد لغة الرمز=%s."
414
-#: ../src/controlpanel/model/language.py:127
416
-msgid "Sorry I do not speak '%s'."
417
-msgstr "آسف، لا أتحدث '%s'."
419
-#: ../src/controlpanel/model/network.py:48
420
-msgid "You must enter a server."
421
-msgstr "يجب أن تُدخِل خادوما."
423
-#: ../src/controlpanel/model/network.py:63
424
-msgid "State is unknown."
425
-msgstr "الحالة مجهولة."
427
-#: ../src/controlpanel/model/network.py:83
428
-msgid "Error in specified radio argument use on/off."
429
-msgstr "خطأ في معامل الإذاعة المحدد، استخدم مُفعّل/مُعطّل."
431
-#: ../src/controlpanel/model/power.py:57
432
-msgid "Error in automatic pm argument, use on/off."
435
-#: ../src/controlpanel/model/power.py:86
436
-msgid "Error in extreme pm argument, use on/off."
439
-#: ../src/controlpanel/view/aboutme.py:32
443
-#: ../src/controlpanel/view/aboutme.py:134
444
+#: ../extensions/cpsection/aboutme/view.py:128
445
msgid "Click to change your color:"
446
msgstr "انقر لتغيير اللون:"
448
-#: ../src/controlpanel/view/aboutxo.py:28
450
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
451
+msgid "About my Computer"
454
-#: ../src/controlpanel/view/aboutxo.py:59
455
+#: ../extensions/cpsection/aboutcomputer/model.py:28
456
+msgid "Not available"
459
+#: ../extensions/cpsection/aboutcomputer/view.py:60
463
-#: ../src/controlpanel/view/aboutxo.py:68
464
+#: ../extensions/cpsection/aboutcomputer/view.py:69
465
msgid "Serial Number:"
466
-msgstr "الرقم التسلسلي"
467
+msgstr "الرقم التسلسلي:"
469
-#: ../src/controlpanel/view/aboutxo.py:91
470
+#: ../extensions/cpsection/aboutcomputer/view.py:91
474
-#: ../src/controlpanel/view/aboutxo.py:100
475
+#: ../extensions/cpsection/aboutcomputer/view.py:100
479
-#: ../src/controlpanel/view/aboutxo.py:115
480
+#: ../extensions/cpsection/aboutcomputer/view.py:115
484
-#: ../src/controlpanel/view/aboutxo.py:130
485
+#: ../extensions/cpsection/aboutcomputer/view.py:131
487
-msgstr "البرمجيات الثابتة (Firmware):"
488
+msgstr "البرمجيات المضمّنة:"
490
-#: ../src/controlpanel/view/aboutxo.py:152
491
+#: ../extensions/cpsection/aboutcomputer/view.py:146
492
+msgid "Wireless Firmware:"
493
+msgstr "برمجية اللاسلكي المضمّنة:"
495
+#: ../extensions/cpsection/aboutcomputer/view.py:169
496
msgid "Copyright and License"
497
msgstr "حقوق النشر والترخيص"
499
-#: ../src/controlpanel/view/aboutxo.py:160
501
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
502
-msgstr "حقوق النشر محفوظة 2008 لجمعية حاسوب محمول لكل طفل؛ ردهات؛ والمساهمين."
504
-#: ../src/controlpanel/view/aboutxo.py:166
505
+#: ../extensions/cpsection/aboutcomputer/view.py:184
507
"Sugar is the graphical user interface that you are looking at. Sugar is free "
508
"software, covered by the GNU General Public License, and you are welcome to "
509
@@ -467,183 +115,961 @@ msgstr ""
510
"لرخصة جنو للتأميم عامّة الأغراض، ويمكنك تعديلها و/أو توزيع نسخ منها وفق شروط "
513
-#: ../src/controlpanel/view/aboutxo.py:178
514
+#: ../extensions/cpsection/aboutcomputer/view.py:196
515
msgid "Full license:"
516
msgstr "الترخيص كاملا:"
518
-#: ../src/controlpanel/view/datetime.py:29
519
+#: ../extensions/cpsection/datetime/__init__.py:21
521
msgstr "التاريخ والوقت"
523
-#: ../src/controlpanel/view/datetime.py:72
524
+#: ../extensions/cpsection/datetime/model.py:87
525
+msgid "Error timezone does not exist."
526
+msgstr "خطأ: المنطقة الزمنية لا وجود لها."
528
+#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
530
msgstr "المنطقة الزمنية"
532
-#: ../src/controlpanel/view/frame.py:28
533
+#: ../extensions/cpsection/frame/__init__.py:21
537
-#: ../src/controlpanel/view/frame.py:30
538
+#: ../extensions/cpsection/frame/model.py:38
539
+#: ../extensions/cpsection/frame/model.py:60
540
+msgid "Value must be an integer."
541
+msgstr "يجب أن تكون القيمة عددا صحيحا."
543
+#: ../extensions/cpsection/frame/view.py:26
547
-#: ../src/controlpanel/view/frame.py:31
548
+#: ../extensions/cpsection/frame/view.py:27
549
msgid "instantaneous"
552
-#: ../src/controlpanel/view/frame.py:32
553
+#: ../extensions/cpsection/frame/view.py:28
559
-#: ../src/controlpanel/view/frame.py:56
560
+#: ../extensions/cpsection/frame/view.py:52
561
msgid "Activation Delay"
562
msgstr "تأخير التفعيل"
564
-#: ../src/controlpanel/view/frame.py:80
565
+#: ../extensions/cpsection/frame/view.py:76
570
-#: ../src/controlpanel/view/frame.py:115
571
+#: ../extensions/cpsection/frame/view.py:111
575
-#: ../src/controlpanel/view/language.py:29
576
-#: ../src/controlpanel/view/language.py:74
577
+#: ../extensions/cpsection/language/__init__.py:21
578
+#: ../extensions/cpsection/language/view.py:32
582
-#: ../src/controlpanel/view/network.py:28
583
+#: ../extensions/cpsection/language/model.py:28
584
+msgid "Could not access ~/.i18n. Create standard settings."
585
+msgstr "تعذّر الوصول إلى ~/.i18n. سأنشئ إعدادات قياسية."
587
+#: ../extensions/cpsection/language/model.py:124
589
+msgid "Language for code=%s could not be determined."
590
+msgstr "لا يمكن تحديد لغة الرمز=%s."
592
+#: ../extensions/cpsection/language/model.py:144
594
+msgid "Sorry I do not speak '%s'."
595
+msgstr "آسف، لا أتحدث '%s'."
597
+#: ../extensions/cpsection/network/__init__.py:21
598
+#: ../extensions/cpsection/network/view.py:28
602
-#: ../src/controlpanel/view/network.py:53
603
+#: ../extensions/cpsection/network/model.py:79
604
+msgid "State is unknown."
605
+msgstr "الحالة مجهولة."
607
+#: ../extensions/cpsection/network/model.py:105
608
+msgid "Error in specified radio argument use on/off."
609
+msgstr "خطأ في معامل الإذاعة المحدد، استخدم مُفعّل/مُعطّل."
611
+#: ../extensions/cpsection/network/model.py:137
612
+msgid "Error in specified argument use 0/1."
613
+msgstr "خطأ في المعامل المحدد، استخدم 0\\1."
615
+#: ../extensions/cpsection/network/view.py:56
619
-#: ../src/controlpanel/view/network.py:61
622
+#: ../extensions/cpsection/network/view.py:64
623
+msgid "Turn off the wireless radio to save battery life"
624
+msgstr "عطل اللاسلكي لتوفير الطاقة"
626
-#: ../src/controlpanel/view/network.py:94
628
-msgstr "الشبكة العروية"
629
+#: ../extensions/cpsection/network/view.py:77
633
-#: ../src/controlpanel/view/network.py:103
634
+#: ../extensions/cpsection/network/view.py:93
635
+msgid "Discard network history if you have trouble connecting to the network"
636
+msgstr "تجاهل تأريخ الشبكة إن كنت تواجه مشاكل في الاتصال بالشبكة"
638
+#: ../extensions/cpsection/network/view.py:102
639
+msgid "Discard network history"
640
+msgstr "تجاهل تأريخ الشبكة"
642
+#: ../extensions/cpsection/network/view.py:115
643
+msgid "Collaboration"
646
+#: ../extensions/cpsection/network/view.py:123
648
+"The server is the equivalent of what room you are in; people on the same "
649
+"server will be able to see each other, even when they aren't on the same "
652
+"الخادوم مثله مثل الغرفة التي تجلس بها؛ الأشخاص على نفس الخادوم يرون بعضهم "
653
+"البعض، حتى لو لم يكونوا على نفس الشبكة."
655
+#: ../extensions/cpsection/network/view.py:133
660
-#: ../src/controlpanel/view/power.py:27
661
+#: ../extensions/cpsection/power/__init__.py:21
665
-#: ../src/controlpanel/view/power.py:51
666
+#: ../extensions/cpsection/power/model.py:54
667
+msgid "Error in automatic pm argument, use on/off."
668
+msgstr "خطأ في معامل pm التلقائي، استخدم on/off."
670
+#: ../extensions/cpsection/power/model.py:81
671
+msgid "Error in extreme pm argument, use on/off."
672
+msgstr "خطأ في معامل pm المتطرف، استخدم on/off."
674
+#: ../extensions/cpsection/power/view.py:47
675
msgid "Power management"
676
msgstr "إدارة الطاقة"
678
-#: ../src/controlpanel/view/power.py:61
679
+#: ../extensions/cpsection/power/view.py:57
680
msgid "Automatic power management (increases battery life)"
681
msgstr "إدارة آلية للطاقة (تطيل من عمر البطارية)"
683
-#: ../src/controlpanel/view/power.py:89
684
+#: ../extensions/cpsection/power/view.py:85
686
"Extreme power management (disableswireless radio, increases battery life)"
687
msgstr "إدارة قصوى للطاقة (تعطّل اللاسلكي وتطيل عمر البطارية)"
689
-#: ../src/view/devices/network/mesh.py:111
690
-msgid "Connected to a School Mesh Portal"
691
-msgstr "اتصل ببوابة شبكة مدرسة"
692
+#: ../extensions/deviceicon/battery.py:58
696
-#: ../src/view/devices/network/mesh.py:113
697
-msgid "Looking for a School Mesh Portal..."
698
-msgstr "يبحث عن بوابة شبكة مدرسة..."
699
+#: ../extensions/deviceicon/battery.py:137
703
-#: ../src/view/devices/network/mesh.py:116
704
-msgid "Connected to an XO Mesh Portal"
705
-msgstr "اتصل ببوابة شبكة XO"
706
+#: ../extensions/deviceicon/battery.py:140
710
-#: ../src/view/devices/network/mesh.py:118
711
-msgid "Looking for an XO Mesh Portal..."
712
-msgstr "يبحث عن بوابة شبكة XO..."
713
+#: ../extensions/deviceicon/battery.py:143
714
+msgid "Very little power remaining"
715
+msgstr "بقي القليل جدا من الطاقة"
717
-#: ../src/view/devices/network/mesh.py:121
718
-msgid "Connected to a Simple Mesh"
719
-msgstr "اتصل بشبكة بسيطة"
720
+#: ../extensions/deviceicon/battery.py:149
722
+msgid "%(hour)d:%(min).2d remaining"
723
+msgstr "باقي %(hour)d:%(min).2d"
725
-#: ../src/view/devices/network/mesh.py:123
726
-msgid "Starting a Simple Mesh"
727
-msgstr "يبدأ شبكة بسيطة"
728
+#: ../extensions/deviceicon/battery.py:152
732
-#: ../src/view/devices/network/mesh.py:130
733
-msgid "Unknown Mesh"
734
-msgstr "شبكة مجهولة"
735
+#: ../extensions/deviceicon/network.py:40
737
+msgid "IP address: %s"
738
+msgstr "رقم (عنوان) الإنترنت: %s"
740
-#: ../src/view/frame/activitiestray.py:210
743
+# Only show disconnect when there's a mesh device, because mesh takes
744
+# priority over the normal wireless device. NM doesn't have a "disconnect"
745
+# method for a device either (for various reasons) so this doesn't
746
+# have a good mapping
747
+#: ../extensions/deviceicon/network.py:104
748
+msgid "Disconnect..."
751
-#: ../src/view/home/favoritesview.py:286
752
+#: ../extensions/deviceicon/network.py:109
753
+#: ../src/jarabe/desktop/meshbox.py:250
754
+msgid "Connecting..."
755
+msgstr "يجري الاتصال..."
757
+# TODO: show the channel number
758
+#: ../extensions/deviceicon/network.py:113
759
+#: ../extensions/deviceicon/network.py:166
760
+#: ../src/jarabe/desktop/meshbox.py:256
764
+#: ../extensions/deviceicon/network.py:126
768
+#: ../extensions/deviceicon/network.py:141
769
+msgid "Wired Network"
772
+#: ../extensions/deviceicon/network.py:169
776
+#: ../extensions/deviceicon/speaker.py:59
780
+#: ../extensions/deviceicon/speaker.py:133
784
+#: ../extensions/deviceicon/speaker.py:136
788
+#: ../extensions/globalkey/screenshot.py:51
792
+#: ../data/sugar.schemas.in.h:1
794
+msgstr "مسار النسخ الاحتياطي"
796
+#: ../data/sugar.schemas.in.h:2
798
+"Color for the XO icon that is used throughout the desktop. The string is "
799
+"composed of the stroke color and fill color, format is that of rbg colors. "
800
+"Example: #AC32FF,#9A5200"
802
+"لون الأيقونة المستخدم في أنحاء سطح المكتب. يركب من لون الحواف ولون الملء "
803
+"بنسق ألون rbg. مثال: #AC32FF,#9A5200"
805
+#: ../data/sugar.schemas.in.h:3
806
+msgid "Corner Delay"
807
+msgstr "تأخير الركن"
809
+#: ../data/sugar.schemas.in.h:4
810
+msgid "Delay for the activation of the frame using the corners."
811
+msgstr "تأخير تنشيط الإطار باستخدام الأركان"
813
+#: ../data/sugar.schemas.in.h:5
814
+msgid "Delay for the activation of the frame using the edges."
815
+msgstr "تأخير تنشيط الإطار باستخدام الحواف"
817
+#: ../data/sugar.schemas.in.h:6
819
+msgstr "تأخير الحافة"
821
+#: ../data/sugar.schemas.in.h:7
822
+msgid "Favorites Layout"
825
+#: ../data/sugar.schemas.in.h:8
826
+msgid "Favorites resume mode"
829
+#: ../data/sugar.schemas.in.h:9
831
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
835
+#: ../data/sugar.schemas.in.h:10
836
+msgid "Jabber Server"
837
+msgstr "خادوم جابِر"
839
+#: ../data/sugar.schemas.in.h:11
840
+msgid "Layout of the favorites view."
841
+msgstr "تنظيم المنظور المفضل"
843
+#: ../data/sugar.schemas.in.h:12
844
+msgid "Power Automatic"
845
+msgstr "الطاقة تلقائية"
847
+#: ../data/sugar.schemas.in.h:13
848
+msgid "Power Automatic."
849
+msgstr "الطاقة تلقائية."
851
+#: ../data/sugar.schemas.in.h:14
852
+msgid "Power Extreme"
853
+msgstr "الطاقة متشددة"
855
+#: ../data/sugar.schemas.in.h:15
856
+msgid "Power Extreme."
857
+msgstr "الطاقة متشددة."
859
+#: ../data/sugar.schemas.in.h:16
860
+msgid "Publish to Gadget"
863
+#: ../data/sugar.schemas.in.h:17
864
+msgid "Setting for muting the sound device."
867
+#: ../data/sugar.schemas.in.h:18
869
+msgstr "الصوت مُصمَت"
871
+#: ../data/sugar.schemas.in.h:20
872
+msgid "Timezone setting for the system."
875
+#: ../data/sugar.schemas.in.h:21
876
+msgid "Url of the jabber server to use."
879
+#: ../data/sugar.schemas.in.h:22
880
+msgid "Url where the backup is saved to."
883
+#: ../data/sugar.schemas.in.h:23
885
+msgstr "لون المستخدم"
887
+#: ../data/sugar.schemas.in.h:24
889
+msgstr "اسم المستخدم"
891
+#: ../data/sugar.schemas.in.h:25
892
+msgid "User name that is used throughout the desktop."
893
+msgstr "اسم المستخدم المستَخدم في أرجاء سطح المكتب."
895
+#: ../data/sugar.schemas.in.h:26
896
+msgid "Volume Level"
897
+msgstr "مستوى الصوت"
899
+#: ../data/sugar.schemas.in.h:27
900
+msgid "Volume level for the sound device."
901
+msgstr "مستوى شدة الصوت."
903
+#: ../data/sugar.schemas.in.h:28
905
+"When in resume mode, clicking on a favorite icon will cause the last entry "
906
+"for that activity to be resumed."
909
+#: ../src/jarabe/controlpanel/cmd.py:28
912
+"sugar-control-panel: WARNING, found more than one option with the same name: "
916
+#: ../src/jarabe/controlpanel/cmd.py:30
918
+msgid "sugar-control-panel: key=%s not an available option"
921
+#: ../src/jarabe/controlpanel/cmd.py:31
923
+msgid "sugar-control-panel: %s"
926
+#. TRANS: Translators, there's a empty line at the end of this string,
927
+#. which must appear in the translated string (msgstr) as well.
928
+#: ../src/jarabe/controlpanel/cmd.py:37
930
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
931
+" Control for the sugar environment. \n"
933
+" -h show this help message and exit \n"
934
+" -l list all the available options \n"
935
+" -h key show information about this key \n"
936
+" -g key get the current value of the key \n"
937
+" -s key set the current value for the key \n"
938
+" -c key clear the current value for the key \n"
942
+#: ../src/jarabe/controlpanel/cmd.py:50
943
+msgid "To apply your changes you have to restart sugar.\n"
944
+msgstr "تحتاج لإعادة تشغيل «سُكّر» لتُطبق التغييرات.\n"
946
+#: ../src/jarabe/controlpanel/gui.py:275
950
+#: ../src/jarabe/controlpanel/gui.py:276
951
+#: ../src/jarabe/controlpanel/sectionview.py:42
952
+msgid "Changes require restart"
953
+msgstr "تتطلب التغييرات إعادة التشغيل"
955
+#: ../src/jarabe/controlpanel/gui.py:279
956
+msgid "Cancel changes"
957
+msgstr "ألغِ التغييرات"
959
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
963
+#: ../src/jarabe/controlpanel/gui.py:288
965
+msgstr "أعِد التشغيل الآن"
967
+#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
971
+#: ../src/jarabe/controlpanel/toolbar.py:115
972
+#: ../src/jarabe/desktop/homebox.py:111
973
+#: ../src/jarabe/frame/activitiestray.py:726
974
+#: ../src/jarabe/frame/activitiestray.py:821
975
+#: ../src/jarabe/frame/activitiestray.py:849
979
+#: ../src/jarabe/controlpanel/toolbar.py:121
980
+#: ../src/jarabe/desktop/favoritesview.py:339
984
+# TRANS: label for the freeform layout in the favorites view
985
+#. TRANS: label for the freeform layout in the favorites view
986
+#: ../src/jarabe/desktop/favoriteslayout.py:116
990
+# TRANS: label for the ring layout in the favorites view
991
+#. TRANS: label for the ring layout in the favorites view
992
+#: ../src/jarabe/desktop/favoriteslayout.py:198
996
+#. TRANS: label for the spiral layout in the favorites view
997
+#: ../src/jarabe/desktop/favoriteslayout.py:334
1001
+#. TRANS: label for the box layout in the favorites view
1002
+#: ../src/jarabe/desktop/favoriteslayout.py:401
1006
+#. TRANS: label for the box layout in the favorites view
1007
+#: ../src/jarabe/desktop/favoriteslayout.py:442
1011
+#: ../src/jarabe/desktop/favoritesview.py:330
1012
msgid "Registration Failed"
1013
msgstr "فشل التسجيل"
1015
-#: ../src/view/home/favoritesview.py:287
1016
+#: ../src/jarabe/desktop/favoritesview.py:331
1021
-#: ../src/view/home/favoritesview.py:289
1022
+#: ../src/jarabe/desktop/favoritesview.py:333
1023
msgid "Registration Successful"
1024
msgstr "نجح التسجيل"
1026
-#: ../src/view/home/favoritesview.py:290
1027
+#: ../src/jarabe/desktop/favoritesview.py:334
1028
msgid "You are now registered with your school server."
1029
msgstr "الآن، أنت مسجّل في خادوم مدرستك."
1031
-#: ../src/view/home/favoritesview.py:407
1032
-msgid "Control Panel"
1033
-msgstr "لوحة التحكم"
1034
+#: ../src/jarabe/desktop/favoritesview.py:674
1038
-#: ../src/view/home/favoritesview.py:418
1039
+#: ../src/jarabe/desktop/homebox.py:67
1040
+msgid "Confirm erase"
1041
+msgstr "أكّد المسح"
1043
+#: ../src/jarabe/desktop/homebox.py:69
1045
+msgid "Confirm erase: Do you want to permanently erase %s?"
1046
+msgstr "أكّد المسح: أتريد مسح %s نهائيا؟"
1048
+# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
1049
+# TODO: Implement stopping downloads
1050
+# self._stop_item.connect('activate', self._stop_item_activate_cb)
1051
+# self.append_menu_item(self._stop_item)
1052
+#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
1053
+#: ../src/jarabe/view/viewsource.py:218
1057
+#: ../src/jarabe/desktop/homebox.py:76
1058
+#: ../src/jarabe/journal/journaltoolbox.py:357
1059
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
1063
+#: ../src/jarabe/desktop/homebox.py:106
1064
+msgid "Software Update"
1065
+msgstr "تحديث البرمجيات"
1067
+#: ../src/jarabe/desktop/homebox.py:107
1068
+msgid "Update your activities to ensure compatibility with your new software"
1069
+msgstr "حدّث نشاطاتك لتضمن التوافقية مع البرمجيات الجديدة"
1071
+#: ../src/jarabe/desktop/homebox.py:116
1073
+msgstr "التمس الآن"
1075
+#: ../src/jarabe/desktop/homebox.py:233
1077
+msgstr "منظور القائمة"
1079
+#: ../src/jarabe/desktop/homebox.py:234
1083
+#: ../src/jarabe/desktop/homebox.py:296
1084
+msgid "Favorites view"
1085
+msgstr "المنظور المفضل"
1087
+#: ../src/jarabe/desktop/homebox.py:297
1091
+#: ../src/jarabe/desktop/keydialog.py:131
1093
+msgstr "نوع المفتاح:"
1095
+#: ../src/jarabe/desktop/keydialog.py:151
1096
+msgid "Authentication Type:"
1097
+msgstr "نوع الاستيثاق:"
1099
+#: ../src/jarabe/desktop/keydialog.py:215
1100
+msgid "WPA & WPA2 Personal"
1101
+msgstr "WPA و WPA2 شخصي"
1103
+#: ../src/jarabe/desktop/keydialog.py:224
1104
+msgid "Wireless Security:"
1105
+msgstr "أمن اللاسلكي:"
1107
+#: ../src/jarabe/desktop/meshbox.py:134
1111
+#: ../src/jarabe/desktop/meshbox.py:138
1113
+msgstr "اقطع الاتصال"
1115
+#. TRANS: Action label for resuming an activity.
1116
+#: ../src/jarabe/desktop/meshbox.py:444
1117
+#: ../src/jarabe/frame/activitiestray.py:761
1118
+#: ../src/jarabe/journal/journaltoolbox.py:425
1119
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
1123
+#: ../src/jarabe/desktop/meshbox.py:449
1124
+#: ../src/jarabe/frame/activitiestray.py:235
1128
+#: ../src/jarabe/desktop/schoolserver.py:34
1129
+msgid "Cannot obtain data needed for registration."
1130
+msgstr "تعذّر الحصول على البيانات المطلوبة للتسجيل."
1132
+#: ../src/jarabe/desktop/schoolserver.py:51
1133
+msgid "Cannot connect to the server."
1134
+msgstr "تعذّر الاتصال بالخادوم."
1136
+#: ../src/jarabe/desktop/schoolserver.py:56
1137
+msgid "The server could not complete the request."
1138
+msgstr "لم يستطع الخادوم إكمال الطلب."
1140
+#: ../src/jarabe/frame/activitiestray.py:240
1141
+#: ../src/jarabe/frame/activitiestray.py:698
1145
+#: ../src/jarabe/frame/activitiestray.py:650
1150
+#: ../src/jarabe/frame/activitiestray.py:652
1155
+#: ../src/jarabe/frame/activitiestray.py:654
1160
+#: ../src/jarabe/frame/activitiestray.py:671
1165
+#: ../src/jarabe/frame/activitiestray.py:683
1167
+msgid "Transfer from %r"
1170
+#: ../src/jarabe/frame/activitiestray.py:693
1174
+#: ../src/jarabe/frame/activitiestray.py:716
1175
+#: ../src/jarabe/frame/activitiestray.py:839
1180
+#: ../src/jarabe/frame/activitiestray.py:750
1181
+#: ../src/jarabe/frame/activitiestray.py:873
1185
+#: ../src/jarabe/frame/activitiestray.py:810
1187
+msgid "Transfer to %r"
1188
+msgstr "نقل إلى %r"
1190
+#: ../src/jarabe/frame/clipboardmenu.py:52
1194
+#: ../src/jarabe/frame/clipboardmenu.py:57
1195
+#: ../src/jarabe/frame/clipboardmenu.py:80
1199
+#: ../src/jarabe/frame/clipboardmenu.py:85
1201
+msgstr "افتح باستخدام"
1203
+#: ../src/jarabe/frame/clipboardobject.py:49
1205
+msgid "%s clipping"
1208
+#: ../src/jarabe/frame/zoomtoolbar.py:36
1209
+msgid "Neighborhood"
1212
+#: ../src/jarabe/frame/zoomtoolbar.py:38
1216
+#: ../src/jarabe/frame/zoomtoolbar.py:40
1220
+#: ../src/jarabe/frame/zoomtoolbar.py:42
1224
+#: ../src/jarabe/intro/window.py:124
1225
+msgid "Click to change color:"
1226
+msgstr "انقر لتغيير اللون:"
1228
+#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
1232
+#: ../src/jarabe/intro/window.py:191
1236
+#: ../src/jarabe/journal/collapsedentry.py:258
1237
+#: ../src/jarabe/journal/expandedentry.py:159
1238
+#: ../src/jarabe/journal/palettes.py:66
1240
+msgstr "بدون عنوان"
1242
+#: ../src/jarabe/journal/expandedentry.py:205
1246
+#: ../src/jarabe/journal/expandedentry.py:224
1247
+msgid "Participants:"
1248
+msgstr "المشاركون:"
1250
+#: ../src/jarabe/journal/expandedentry.py:247
1251
+msgid "Description:"
1254
+#: ../src/jarabe/journal/expandedentry.py:273
1258
+#: ../src/jarabe/journal/journalactivity.py:108
1259
+#: ../src/jarabe/journal/volumestoolbar.py:47
1263
+#: ../src/jarabe/journal/journaltoolbox.py:65
1267
+#: ../src/jarabe/journal/journaltoolbox.py:124
1271
+#: ../src/jarabe/journal/journaltoolbox.py:126
1275
+#: ../src/jarabe/journal/journaltoolbox.py:128
1276
+msgid "Since yesterday"
1279
+#. TRANS: Filter entries modified during the last 7 days.
1280
+#: ../src/jarabe/journal/journaltoolbox.py:130
1282
+msgstr "الأسبوع الماضي"
1284
+#. TRANS: Filter entries modified during the last 30 days.
1285
+#: ../src/jarabe/journal/journaltoolbox.py:132
1287
+msgstr "الشهر الماضي"
1289
+#. TRANS: Filter entries modified during the last 356 days.
1290
+#: ../src/jarabe/journal/journaltoolbox.py:134
1292
+msgstr "السنة الماضية"
1294
+#: ../src/jarabe/journal/journaltoolbox.py:141
1298
+#: ../src/jarabe/journal/journaltoolbox.py:143
1302
+#: ../src/jarabe/journal/journaltoolbox.py:144
1306
+#. TRANS: Item in a combo box that filters by entry type.
1307
+#: ../src/jarabe/journal/journaltoolbox.py:271
1311
+#: ../src/jarabe/journal/journaltoolbox.py:347
1312
+#: ../src/jarabe/journal/palettes.py:90
1316
+#. TRANS: Action label for starting an entry.
1317
+#: ../src/jarabe/journal/journaltoolbox.py:428
1318
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
1322
+#: ../src/jarabe/journal/listview.py:40
1323
+msgid "Your Journal is empty"
1324
+msgstr "سجلّك خالِ"
1326
+#: ../src/jarabe/journal/listview.py:41
1327
+msgid "No matching entries "
1328
+msgstr "لا نتائج مطابقة "
1330
+#: ../src/jarabe/journal/listview.py:370
1331
+msgid "Clear search"
1332
+msgstr "امسح البحث"
1334
+#: ../src/jarabe/journal/misc.py:93
1338
+#: ../src/jarabe/journal/modalalert.py:63
1339
+msgid "Your Journal is full"
1340
+msgstr "سجلّك ممتلئ"
1342
+#: ../src/jarabe/journal/modalalert.py:67
1343
+msgid "Please delete some old Journal entries to make space for new ones."
1344
+msgstr "من فضلك امسح بعض مُدخلات السجل القديمة لإخلاء مساحة للمُدخلات الجديدة."
1346
+#: ../src/jarabe/journal/modalalert.py:79
1347
+msgid "Show Journal"
1348
+msgstr "أظهر السجل"
1350
+#: ../src/jarabe/journal/objectchooser.py:147
1351
+msgid "Choose an object"
1352
+msgstr "اختر عنصرا"
1354
+#: ../src/jarabe/journal/objectchooser.py:152
1355
+#: ../src/jarabe/view/viewsource.py:308
1359
+#: ../src/jarabe/journal/palettes.py:73
1360
+msgid "Resume with"
1363
+#: ../src/jarabe/journal/palettes.py:76
1367
+#: ../src/jarabe/journal/palettes.py:98
1371
+#: ../src/jarabe/journal/palettes.py:107
1372
+msgid "View Details"
1373
+msgstr "اعرض التفاصيل"
1375
+#: ../src/jarabe/journal/palettes.py:185
1376
+msgid "No friends present"
1377
+msgstr "لا يوجد أصدقاء"
1379
+#: ../src/jarabe/journal/palettes.py:190
1380
+msgid "No valid connection found"
1381
+msgstr "لم يُعثر على اتصال سليم"
1383
+#: ../src/jarabe/journal/palettes.py:218
1384
+msgid "No activity to resume entry"
1385
+msgstr "لا نشاط لاستكمال المُدخلة"
1387
+#: ../src/jarabe/journal/palettes.py:220
1388
+msgid "No activity to start entry"
1389
+msgstr "لا نشاط لبدء المُدخلة"
1391
+#: ../src/jarabe/view/buddymenu.py:62
1392
+msgid "Remove friend"
1395
+#: ../src/jarabe/view/buddymenu.py:65
1396
+msgid "Make friend"
1399
+#: ../src/jarabe/view/buddymenu.py:82
1400
+msgid "My Settings"
1403
+#: ../src/jarabe/view/buddymenu.py:90
1407
+#: ../src/jarabe/view/buddymenu.py:95
1409
msgstr "أعد التشغيل"
1411
-#: ../src/view/home/favoritesview.py:423
1412
+#: ../src/jarabe/view/buddymenu.py:100
1416
-#: ../src/view/home/favoritesview.py:429
1419
+#: ../src/jarabe/view/buddymenu.py:135
1421
+msgid "Invite to %s"
1422
+msgstr "ادعُ إلى %s"
1424
-#: ../src/view/palettes.py:42
1425
+#: ../src/jarabe/view/palettes.py:47
1429
-#: ../src/view/palettes.py:72
1430
+#. TODO: share-with, keep
1431
+#: ../src/jarabe/view/palettes.py:73
1432
+msgid "View Source"
1433
+msgstr "عرض المصدر"
1435
+#: ../src/jarabe/view/palettes.py:84
1439
-#: ../src/view/palettes.py:104
1443
-#: ../src/view/palettes.py:132
1444
+#: ../src/jarabe/view/palettes.py:174
1445
msgid "Remove favorite"
1446
msgstr "احذف المفضلة"
1448
-#: ../src/view/palettes.py:136
1449
+#: ../src/jarabe/view/palettes.py:178
1450
msgid "Make favorite"
1453
-#: ../src/view/palettes.py:185
1454
+#: ../src/jarabe/view/palettes.py:241
1455
msgid "Show contents"
1456
msgstr "أظهر المحتويات"
1458
-#: ../src/view/palettes.py:209
1459
+#: ../src/jarabe/view/palettes.py:263 ../src/jarabe/view/palettes.py:313
1461
msgid "%(free_space)d MB Free"
1462
msgstr "%(free_space)d م.بايت خالية"
1464
+#: ../src/jarabe/view/palettes.py:288
1468
+#: ../src/jarabe/view/viewsource.py:208
1469
+msgid "Instance Source"
1470
+msgstr "مصدر السيرورة"
1472
+#: ../src/jarabe/view/viewsource.py:233
1476
+#: ../src/jarabe/view/viewsource.py:292
1477
+msgid "Activity Bundle Source"
1478
+msgstr "مصدر حزمة النشاط"
1480
+#: ../src/jarabe/view/viewsource.py:299
1482
+msgid "View source: %r"
1483
+msgstr "اعرض مصدر: %r"
1486
+#~ msgid "Clipboard object: %s."
1487
+#~ msgstr "عنصر الحافظة: %s."
1489
+#~ msgid "Encryption Type:"
1490
+#~ msgstr "نوع التعمية:"
1492
+# Only show disconnect when there's a mesh device, because mesh takes
1493
+# priority over the normal wireless device. NM doesn't have a "disconnect"
1494
+# method for a device either (for various reasons) so this doesn't
1495
+# have a good mapping
1496
+#~ msgid "Disconnecting..."
1497
+#~ msgstr "يجري قطع الاتصال..."
1499
+#~ msgid "Mesh Network"
1500
+#~ msgstr "شبكة عُروِيّة"
1502
+#~ msgid "Disconnected"
1505
+#~ msgid "You must enter a server."
1506
+#~ msgstr "يجب أن تُدخِل خادوما."
1508
+#~ msgid "About my XO"
1509
+#~ msgstr "عن حاسوبي"
1512
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
1513
+#~ msgstr "حقوق النشر محفوظة 2008 لجمعية حاسوب محمول لكل طفل؛ ردهات؛ والمساهمين."
1516
+#~ msgstr "الشبكة العروية"
1518
+#~ msgid "Connected to a School Mesh Portal"
1519
+#~ msgstr "اتصل ببوابة شبكة مدرسة"
1521
+#~ msgid "Looking for a School Mesh Portal..."
1522
+#~ msgstr "يبحث عن بوابة شبكة مدرسة..."
1524
+#~ msgid "Connected to an XO Mesh Portal"
1525
+#~ msgstr "اتصل ببوابة شبكة XO"
1527
+#~ msgid "Looking for an XO Mesh Portal..."
1528
+#~ msgstr "يبحث عن بوابة شبكة XO..."
1530
+#~ msgid "Connected to a Simple Mesh"
1531
+#~ msgstr "اتصل بشبكة بسيطة"
1533
+#~ msgid "Starting a Simple Mesh"
1534
+#~ msgstr "يبدأ شبكة بسيطة"
1536
+#~ msgid "Unknown Mesh"
1537
+#~ msgstr "شبكة مجهولة"
1539
+#~ msgid "Control Panel"
1540
+#~ msgstr "لوحة التحكم"
1545
@@ -740,9 +1166,6 @@ msgstr "%(free_space)d م.بايت خالية"
1555
@@ -819,5 +1242,10 @@ msgstr "%(free_space)d م.بايت خالية"
1559
+# Only show disconnect when there's a mesh device, because mesh takes
1560
+# priority over the normal wireless device. NM doesn't have a "disconnect"
1561
+# method for a device either (for various reasons) so this doesn't
1562
+# have a good mapping
1566
diff --git a/po/fr.po b/po/fr.po
1567
index a7921fa..dc20248 100644
1570
@@ -6,14 +6,16 @@ msgid ""
1572
"Project-Id-Version: sugar\n"
1573
"Report-Msgid-Bugs-To: \n"
1574
-"POT-Creation-Date: 2009-02-21 00:30-0500\n"
1575
-"PO-Revision-Date: 2009-02-28 10:21-0500\n"
1576
+"POT-Creation-Date: 2009-04-29 17:36-0400\n"
1577
+"PO-Revision-Date: 2009-05-01 11:55-0400\n"
1578
"Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
1579
"Language-Team: French <traduc@traduc.org>\n"
1581
"MIME-Version: 1.0\n"
1582
"Content-Type: text/plain; charset=UTF-8\n"
1583
"Content-Transfer-Encoding: 8bit\n"
1584
-"X-Generator: Pootle 1.1.0rc2\n"
1585
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
1586
+"X-Generator: Pootle 1.2.1\n"
1588
#: ../extensions/cpsection/aboutme/__init__.py:24
1590
@@ -63,50 +65,43 @@ msgstr "Cliquer pour changer de couleur :"
1591
msgid "About my Computer"
1592
msgstr "Mon ordinateur"
1594
-#: ../extensions/cpsection/aboutcomputer/model.py:26
1595
+#: ../extensions/cpsection/aboutcomputer/model.py:28
1596
msgid "Not available"
1597
msgstr "Non disponible"
1599
-#: ../extensions/cpsection/aboutcomputer/view.py:59
1600
+#: ../extensions/cpsection/aboutcomputer/view.py:60
1604
-#: ../extensions/cpsection/aboutcomputer/view.py:68
1605
+#: ../extensions/cpsection/aboutcomputer/view.py:69
1606
msgid "Serial Number:"
1607
msgstr "Numéro de série :"
1609
-#: ../extensions/cpsection/aboutcomputer/view.py:90
1610
+#: ../extensions/cpsection/aboutcomputer/view.py:91
1614
-#: ../extensions/cpsection/aboutcomputer/view.py:99
1615
+#: ../extensions/cpsection/aboutcomputer/view.py:100
1619
-#: ../extensions/cpsection/aboutcomputer/view.py:114
1620
+#: ../extensions/cpsection/aboutcomputer/view.py:115
1624
-#: ../extensions/cpsection/aboutcomputer/view.py:130
1625
+#: ../extensions/cpsection/aboutcomputer/view.py:131
1627
msgstr "Micrologiciel :"
1629
-#: ../extensions/cpsection/aboutcomputer/view.py:145
1630
+#: ../extensions/cpsection/aboutcomputer/view.py:146
1631
msgid "Wireless Firmware:"
1632
msgstr "Micrologiciel sans fil :"
1634
-#: ../extensions/cpsection/aboutcomputer/view.py:168
1635
+#: ../extensions/cpsection/aboutcomputer/view.py:169
1636
msgid "Copyright and License"
1637
msgstr "Copyright et licence"
1639
-#: ../extensions/cpsection/aboutcomputer/view.py:176
1641
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
1643
-"© 2008 One Laptop per Child Association Inc ; Red Hat Inc ; et "
1646
-#: ../extensions/cpsection/aboutcomputer/view.py:183
1647
+#: ../extensions/cpsection/aboutcomputer/view.py:184
1649
"Sugar is the graphical user interface that you are looking at. Sugar is free "
1650
"software, covered by the GNU General Public License, and you are welcome to "
1651
@@ -118,7 +113,7 @@ msgstr ""
1652
"License). Vous êtes autorisé à le modifier et/ou à en distribuer des copies "
1653
"aux conditions spécifiées."
1655
-#: ../extensions/cpsection/aboutcomputer/view.py:195
1656
+#: ../extensions/cpsection/aboutcomputer/view.py:196
1657
msgid "Full license:"
1658
msgstr "Licence complète :"
1660
@@ -271,7 +266,7 @@ msgstr ""
1661
"Gestion extrême de l'alimentation (désactive la radio sans fil, prolonge la "
1662
"durée de vie de la batterie)"
1664
-#: ../extensions/deviceicon/battery.py:56
1665
+#: ../extensions/deviceicon/battery.py:58
1667
msgstr "Ma batterie"
1669
@@ -310,14 +305,14 @@ msgid "Disconnect..."
1670
msgstr "Déconnexion..."
1672
#: ../extensions/deviceicon/network.py:109
1673
-#: ../src/jarabe/desktop/meshbox.py:247
1674
+#: ../src/jarabe/desktop/meshbox.py:250
1675
msgid "Connecting..."
1676
msgstr "Connexion..."
1678
# TODO: show the channel number
1679
#: ../extensions/deviceicon/network.py:113
1680
#: ../extensions/deviceicon/network.py:166
1681
-#: ../src/jarabe/desktop/meshbox.py:253
1682
+#: ../src/jarabe/desktop/meshbox.py:256
1686
@@ -333,19 +328,19 @@ msgstr "Réseau filaire"
1690
-#: ../extensions/deviceicon/speaker.py:46
1691
+#: ../extensions/deviceicon/speaker.py:59
1693
msgstr "Haut-parleurs"
1695
-#: ../extensions/deviceicon/speaker.py:128
1696
+#: ../extensions/deviceicon/speaker.py:133
1698
msgstr "Activer le son"
1700
-#: ../extensions/deviceicon/speaker.py:131
1701
+#: ../extensions/deviceicon/speaker.py:136
1703
msgstr "Mettre en sourdine"
1705
-#: ../extensions/globalkey/screenshot.py:50
1706
+#: ../extensions/globalkey/screenshot.py:51
1708
msgstr "Capture d'écran"
1710
@@ -548,65 +543,65 @@ msgstr "Accepter"
1712
#: ../src/jarabe/controlpanel/toolbar.py:115
1713
#: ../src/jarabe/desktop/homebox.py:111
1714
-#: ../src/jarabe/frame/activitiestray.py:687
1715
-#: ../src/jarabe/frame/activitiestray.py:766
1716
-#: ../src/jarabe/frame/activitiestray.py:794
1717
+#: ../src/jarabe/frame/activitiestray.py:726
1718
+#: ../src/jarabe/frame/activitiestray.py:821
1719
+#: ../src/jarabe/frame/activitiestray.py:849
1723
#: ../src/jarabe/controlpanel/toolbar.py:121
1724
-#: ../src/jarabe/desktop/favoritesview.py:338
1725
+#: ../src/jarabe/desktop/favoritesview.py:339
1729
# TRANS: label for the freeform layout in the favorites view
1730
#. TRANS: label for the freeform layout in the favorites view
1731
-#: ../src/jarabe/desktop/favoriteslayout.py:114
1732
+#: ../src/jarabe/desktop/favoriteslayout.py:116
1736
# TRANS: label for the ring layout in the favorites view
1737
#. TRANS: label for the ring layout in the favorites view
1738
-#: ../src/jarabe/desktop/favoriteslayout.py:196
1739
+#: ../src/jarabe/desktop/favoriteslayout.py:198
1741
msgstr "Concentrique"
1743
# TRANS: label for the spiral layout in the favorites view
1744
#. TRANS: label for the spiral layout in the favorites view
1745
-#: ../src/jarabe/desktop/favoriteslayout.py:332
1746
+#: ../src/jarabe/desktop/favoriteslayout.py:334
1750
# TRANS: label for the box layout in the favorites view
1751
#. TRANS: label for the box layout in the favorites view
1752
-#: ../src/jarabe/desktop/favoriteslayout.py:399
1753
+#: ../src/jarabe/desktop/favoriteslayout.py:401
1757
# TRANS: label for the box layout in the favorites view
1758
#. TRANS: label for the box layout in the favorites view
1759
-#: ../src/jarabe/desktop/favoriteslayout.py:440
1760
+#: ../src/jarabe/desktop/favoriteslayout.py:442
1764
-#: ../src/jarabe/desktop/favoritesview.py:329
1765
+#: ../src/jarabe/desktop/favoritesview.py:330
1766
msgid "Registration Failed"
1767
msgstr "Echec de l'enregistrement"
1769
-#: ../src/jarabe/desktop/favoritesview.py:330
1770
+#: ../src/jarabe/desktop/favoritesview.py:331
1775
-#: ../src/jarabe/desktop/favoritesview.py:332
1776
+#: ../src/jarabe/desktop/favoritesview.py:333
1777
msgid "Registration Successful"
1778
msgstr "Enregistrement réussi"
1780
-#: ../src/jarabe/desktop/favoritesview.py:333
1781
+#: ../src/jarabe/desktop/favoritesview.py:334
1782
msgid "You are now registered with your school server."
1783
msgstr "Vous êtes maintenant enregistré sur le serveur de l'école"
1785
-#: ../src/jarabe/desktop/favoritesview.py:668
1786
+#: ../src/jarabe/desktop/favoritesview.py:674
1788
msgstr "S'enregistrer"
1790
@@ -679,25 +674,25 @@ msgstr "WPA & WPA2 Personal"
1791
msgid "Wireless Security:"
1792
msgstr "Sécurité sans fil :"
1794
-#: ../src/jarabe/desktop/meshbox.py:131
1795
+#: ../src/jarabe/desktop/meshbox.py:134
1799
-#: ../src/jarabe/desktop/meshbox.py:135
1800
+#: ../src/jarabe/desktop/meshbox.py:138
1802
msgstr "Déconnecter"
1804
# TRANS: Action label for resuming an activity.
1805
#. TRANS: Action label for resuming an activity.
1806
-#: ../src/jarabe/desktop/meshbox.py:441
1807
-#: ../src/jarabe/frame/activitiestray.py:711
1808
+#: ../src/jarabe/desktop/meshbox.py:444
1809
+#: ../src/jarabe/frame/activitiestray.py:761
1810
#: ../src/jarabe/journal/journaltoolbox.py:425
1811
#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
1815
-#: ../src/jarabe/desktop/meshbox.py:446
1816
-#: ../src/jarabe/frame/activitiestray.py:227
1817
+#: ../src/jarabe/desktop/meshbox.py:449
1818
+#: ../src/jarabe/frame/activitiestray.py:235
1822
@@ -713,47 +708,52 @@ msgstr "Impossible de se connecter au serveur."
1823
msgid "The server could not complete the request."
1824
msgstr "Le serveur n'a pas pu achever la requête."
1826
-#: ../src/jarabe/frame/activitiestray.py:232
1827
-#: ../src/jarabe/frame/activitiestray.py:659
1828
+#: ../src/jarabe/frame/activitiestray.py:240
1829
+#: ../src/jarabe/frame/activitiestray.py:698
1833
-#: ../src/jarabe/frame/activitiestray.py:612
1834
+#: ../src/jarabe/frame/activitiestray.py:650
1839
-#: ../src/jarabe/frame/activitiestray.py:614
1840
+#: ../src/jarabe/frame/activitiestray.py:652
1845
-#: ../src/jarabe/frame/activitiestray.py:616
1846
+#: ../src/jarabe/frame/activitiestray.py:654
1851
-#: ../src/jarabe/frame/activitiestray.py:633
1852
+#: ../src/jarabe/frame/activitiestray.py:671
1857
-#: ../src/jarabe/frame/activitiestray.py:644
1858
+#: ../src/jarabe/frame/activitiestray.py:683
1860
msgid "Transfer from %r"
1861
msgstr "Transfert depuis %r"
1863
-#: ../src/jarabe/frame/activitiestray.py:654
1864
+#: ../src/jarabe/frame/activitiestray.py:693
1868
-#: ../src/jarabe/frame/activitiestray.py:677
1869
-#: ../src/jarabe/frame/activitiestray.py:784
1870
+#: ../src/jarabe/frame/activitiestray.py:716
1871
+#: ../src/jarabe/frame/activitiestray.py:839
1876
-#: ../src/jarabe/frame/activitiestray.py:755
1877
+#: ../src/jarabe/frame/activitiestray.py:750
1878
+#: ../src/jarabe/frame/activitiestray.py:873
1882
+#: ../src/jarabe/frame/activitiestray.py:810
1884
msgid "Transfer to %r"
1885
msgstr "Transfert vers %r"
1886
@@ -904,11 +904,11 @@ msgstr "Le journal est vide"
1887
msgid "No matching entries "
1888
msgstr "Aucune entrée correspondante"
1890
-#: ../src/jarabe/journal/listview.py:369
1891
+#: ../src/jarabe/journal/listview.py:370
1892
msgid "Clear search"
1893
msgstr "Effacer la recherche"
1895
-#: ../src/jarabe/journal/misc.py:91
1896
+#: ../src/jarabe/journal/misc.py:93
1900
@@ -1009,24 +1009,24 @@ msgstr "Afficher la source"
1904
-#: ../src/jarabe/view/palettes.py:171
1905
+#: ../src/jarabe/view/palettes.py:174
1906
msgid "Remove favorite"
1907
msgstr "Retirer le favori"
1909
-#: ../src/jarabe/view/palettes.py:175
1910
+#: ../src/jarabe/view/palettes.py:178
1911
msgid "Make favorite"
1912
msgstr "Ajouter aux favoris"
1914
-#: ../src/jarabe/view/palettes.py:238
1915
+#: ../src/jarabe/view/palettes.py:241
1916
msgid "Show contents"
1917
msgstr "Afficher les contenus"
1919
-#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
1920
+#: ../src/jarabe/view/palettes.py:263 ../src/jarabe/view/palettes.py:313
1922
msgid "%(free_space)d MB Free"
1923
msgstr "%(free_space)d Mo de libre"
1925
-#: ../src/jarabe/view/palettes.py:285
1926
+#: ../src/jarabe/view/palettes.py:288
1930
@@ -1047,6 +1047,12 @@ msgstr "Source du paquet activité"
1931
msgid "View source: %r"
1932
msgstr "Afficher le code source : %r"
1935
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
1937
+#~ "© 2008 One Laptop per Child Association Inc ; Red Hat Inc ; et "
1938
+#~ "contributeurs."
1941
#~ msgstr "Document"
1943
diff --git a/po/it.po b/po/it.po
1944
index 17c1056..f03bb3d 100644
1947
@@ -6,14 +6,16 @@ msgid ""
1949
"Project-Id-Version: PACKAGE VERSION\n"
1950
"Report-Msgid-Bugs-To: \n"
1951
-"POT-Creation-Date: 2009-02-21 00:30-0500\n"
1952
-"PO-Revision-Date: 2009-03-03 08:01-0500\n"
1953
+"POT-Creation-Date: 2009-04-29 17:36-0400\n"
1954
+"PO-Revision-Date: 2009-04-30 09:33-0400\n"
1955
"Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
1956
"Language-Team: LANGUAGE <LL@li.org>\n"
1958
"MIME-Version: 1.0\n"
1959
"Content-Type: text/plain; charset=UTF-8\n"
1960
"Content-Transfer-Encoding: 8bit\n"
1961
-"X-Generator: Pootle 1.1.0rc2\n"
1962
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
1963
+"X-Generator: Pootle 1.2.1\n"
1965
#: ../extensions/cpsection/aboutme/__init__.py:24
1967
@@ -63,49 +65,43 @@ msgstr "Seleziona per cambiare il tuo colore:"
1968
msgid "About my Computer"
1969
msgstr "Il mio Computer"
1971
-#: ../extensions/cpsection/aboutcomputer/model.py:26
1972
+#: ../extensions/cpsection/aboutcomputer/model.py:28
1973
msgid "Not available"
1974
msgstr "Non disponibile"
1976
-#: ../extensions/cpsection/aboutcomputer/view.py:59
1977
+#: ../extensions/cpsection/aboutcomputer/view.py:60
1981
-#: ../extensions/cpsection/aboutcomputer/view.py:68
1982
+#: ../extensions/cpsection/aboutcomputer/view.py:69
1983
msgid "Serial Number:"
1984
msgstr "Numero di Serie:"
1986
-#: ../extensions/cpsection/aboutcomputer/view.py:90
1987
+#: ../extensions/cpsection/aboutcomputer/view.py:91
1991
-#: ../extensions/cpsection/aboutcomputer/view.py:99
1992
+#: ../extensions/cpsection/aboutcomputer/view.py:100
1996
-#: ../extensions/cpsection/aboutcomputer/view.py:114
1997
+#: ../extensions/cpsection/aboutcomputer/view.py:115
2001
-#: ../extensions/cpsection/aboutcomputer/view.py:130
2002
+#: ../extensions/cpsection/aboutcomputer/view.py:131
2006
-#: ../extensions/cpsection/aboutcomputer/view.py:145
2007
+#: ../extensions/cpsection/aboutcomputer/view.py:146
2008
msgid "Wireless Firmware:"
2009
msgstr "Wireless Firmware:"
2011
-#: ../extensions/cpsection/aboutcomputer/view.py:168
2012
+#: ../extensions/cpsection/aboutcomputer/view.py:169
2013
msgid "Copyright and License"
2014
msgstr "Copyright e Licenza"
2016
-#: ../extensions/cpsection/aboutcomputer/view.py:176
2018
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
2020
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; e Contributori."
2022
-#: ../extensions/cpsection/aboutcomputer/view.py:183
2023
+#: ../extensions/cpsection/aboutcomputer/view.py:184
2025
"Sugar is the graphical user interface that you are looking at. Sugar is free "
2026
"software, covered by the GNU General Public License, and you are welcome to "
2027
@@ -117,7 +113,7 @@ msgstr ""
2028
"chiunque è il benvenuto per apportare modifiche e migliorie e/o distribuirne "
2029
"copie, alle condizioni descritte nella licenza medesima."
2031
-#: ../extensions/cpsection/aboutcomputer/view.py:195
2032
+#: ../extensions/cpsection/aboutcomputer/view.py:196
2033
msgid "Full license:"
2034
msgstr "Testo della Licenza:"
2036
@@ -273,7 +269,7 @@ msgstr ""
2037
"Gestione Risparmio Energetico Estrema (spegne la connessione radio wireless, "
2038
"incrementa la durata delle batterie)"
2040
-#: ../extensions/deviceicon/battery.py:56
2041
+#: ../extensions/deviceicon/battery.py:58
2043
msgstr "La mia Batteria"
2045
@@ -312,14 +308,14 @@ msgid "Disconnect..."
2046
msgstr "Disconnessione..."
2048
#: ../extensions/deviceicon/network.py:109
2049
-#: ../src/jarabe/desktop/meshbox.py:247
2050
+#: ../src/jarabe/desktop/meshbox.py:250
2051
msgid "Connecting..."
2052
msgstr "Connessione..."
2054
# TODO: show the channel number
2055
#: ../extensions/deviceicon/network.py:113
2056
#: ../extensions/deviceicon/network.py:166
2057
-#: ../src/jarabe/desktop/meshbox.py:253
2058
+#: ../src/jarabe/desktop/meshbox.py:256
2062
@@ -335,19 +331,19 @@ msgstr "Rete su cavo"
2066
-#: ../extensions/deviceicon/speaker.py:46
2067
+#: ../extensions/deviceicon/speaker.py:59
2069
msgstr "I miei Altoparlanti"
2071
-#: ../extensions/deviceicon/speaker.py:128
2072
+#: ../extensions/deviceicon/speaker.py:133
2077
-#: ../extensions/deviceicon/speaker.py:131
2078
+#: ../extensions/deviceicon/speaker.py:136
2082
-#: ../extensions/globalkey/screenshot.py:50
2083
+#: ../extensions/globalkey/screenshot.py:51
2087
@@ -553,65 +549,65 @@ msgstr "Fatto"
2089
#: ../src/jarabe/controlpanel/toolbar.py:115
2090
#: ../src/jarabe/desktop/homebox.py:111
2091
-#: ../src/jarabe/frame/activitiestray.py:687
2092
-#: ../src/jarabe/frame/activitiestray.py:766
2093
-#: ../src/jarabe/frame/activitiestray.py:794
2094
+#: ../src/jarabe/frame/activitiestray.py:726
2095
+#: ../src/jarabe/frame/activitiestray.py:821
2096
+#: ../src/jarabe/frame/activitiestray.py:849
2100
#: ../src/jarabe/controlpanel/toolbar.py:121
2101
-#: ../src/jarabe/desktop/favoritesview.py:338
2102
+#: ../src/jarabe/desktop/favoritesview.py:339
2106
# TRANS: label for the freeform layout in the favorites view
2107
#. TRANS: label for the freeform layout in the favorites view
2108
-#: ../src/jarabe/desktop/favoriteslayout.py:114
2109
+#: ../src/jarabe/desktop/favoriteslayout.py:116
2111
msgstr "Formato libero"
2113
# TRANS: label for the ring layout in the favorites view
2114
#. TRANS: label for the ring layout in the favorites view
2115
-#: ../src/jarabe/desktop/favoriteslayout.py:196
2116
+#: ../src/jarabe/desktop/favoriteslayout.py:198
2120
# TRANS: label for the spiral layout in the favorites view
2121
#. TRANS: label for the spiral layout in the favorites view
2122
-#: ../src/jarabe/desktop/favoriteslayout.py:332
2123
+#: ../src/jarabe/desktop/favoriteslayout.py:334
2127
# TRANS: label for the box layout in the favorites view
2128
#. TRANS: label for the box layout in the favorites view
2129
-#: ../src/jarabe/desktop/favoriteslayout.py:399
2130
+#: ../src/jarabe/desktop/favoriteslayout.py:401
2134
# TRANS: label for the box layout in the favorites view
2135
#. TRANS: label for the box layout in the favorites view
2136
-#: ../src/jarabe/desktop/favoriteslayout.py:440
2137
+#: ../src/jarabe/desktop/favoriteslayout.py:442
2141
-#: ../src/jarabe/desktop/favoritesview.py:329
2142
+#: ../src/jarabe/desktop/favoritesview.py:330
2143
msgid "Registration Failed"
2144
msgstr "Registrazione Fallita"
2146
-#: ../src/jarabe/desktop/favoritesview.py:330
2147
+#: ../src/jarabe/desktop/favoritesview.py:331
2152
-#: ../src/jarabe/desktop/favoritesview.py:332
2153
+#: ../src/jarabe/desktop/favoritesview.py:333
2154
msgid "Registration Successful"
2155
msgstr "Registrazione Effettuata"
2157
-#: ../src/jarabe/desktop/favoritesview.py:333
2158
+#: ../src/jarabe/desktop/favoritesview.py:334
2159
msgid "You are now registered with your school server."
2160
msgstr "Ora sei registrato sul tuo server di scuola"
2162
-#: ../src/jarabe/desktop/favoritesview.py:668
2163
+#: ../src/jarabe/desktop/favoritesview.py:674
2167
@@ -686,25 +682,25 @@ msgstr "WPA & WPA2 Personal"
2168
msgid "Wireless Security:"
2169
msgstr "Wireless Security:"
2171
-#: ../src/jarabe/desktop/meshbox.py:131
2172
+#: ../src/jarabe/desktop/meshbox.py:134
2176
-#: ../src/jarabe/desktop/meshbox.py:135
2177
+#: ../src/jarabe/desktop/meshbox.py:138
2179
msgstr "Disconnetti"
2181
# TRANS: Action label for resuming an activity.
2182
#. TRANS: Action label for resuming an activity.
2183
-#: ../src/jarabe/desktop/meshbox.py:441
2184
-#: ../src/jarabe/frame/activitiestray.py:711
2185
+#: ../src/jarabe/desktop/meshbox.py:444
2186
+#: ../src/jarabe/frame/activitiestray.py:761
2187
#: ../src/jarabe/journal/journaltoolbox.py:425
2188
#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
2192
-#: ../src/jarabe/desktop/meshbox.py:446
2193
-#: ../src/jarabe/frame/activitiestray.py:227
2194
+#: ../src/jarabe/desktop/meshbox.py:449
2195
+#: ../src/jarabe/frame/activitiestray.py:235
2199
@@ -720,47 +716,52 @@ msgstr "Impossibile connettersi al server."
2200
msgid "The server could not complete the request."
2201
msgstr "Il server non può completare la richiesta."
2203
-#: ../src/jarabe/frame/activitiestray.py:232
2204
-#: ../src/jarabe/frame/activitiestray.py:659
2205
+#: ../src/jarabe/frame/activitiestray.py:240
2206
+#: ../src/jarabe/frame/activitiestray.py:698
2210
-#: ../src/jarabe/frame/activitiestray.py:612
2211
+#: ../src/jarabe/frame/activitiestray.py:650
2216
-#: ../src/jarabe/frame/activitiestray.py:614
2217
+#: ../src/jarabe/frame/activitiestray.py:652
2222
-#: ../src/jarabe/frame/activitiestray.py:616
2223
+#: ../src/jarabe/frame/activitiestray.py:654
2228
-#: ../src/jarabe/frame/activitiestray.py:633
2229
+#: ../src/jarabe/frame/activitiestray.py:671
2234
-#: ../src/jarabe/frame/activitiestray.py:644
2235
+#: ../src/jarabe/frame/activitiestray.py:683
2237
msgid "Transfer from %r"
2238
msgstr "Trasferisci da %r"
2240
-#: ../src/jarabe/frame/activitiestray.py:654
2241
+#: ../src/jarabe/frame/activitiestray.py:693
2245
-#: ../src/jarabe/frame/activitiestray.py:677
2246
-#: ../src/jarabe/frame/activitiestray.py:784
2247
+#: ../src/jarabe/frame/activitiestray.py:716
2248
+#: ../src/jarabe/frame/activitiestray.py:839
2253
-#: ../src/jarabe/frame/activitiestray.py:755
2254
+#: ../src/jarabe/frame/activitiestray.py:750
2255
+#: ../src/jarabe/frame/activitiestray.py:873
2259
+#: ../src/jarabe/frame/activitiestray.py:810
2261
msgid "Transfer to %r"
2262
msgstr "Trasferisci verso %r"
2263
@@ -912,11 +913,11 @@ msgstr "Il tuo Diario è vuoto"
2264
msgid "No matching entries "
2265
msgstr "Non ci sono dati corrispondenti "
2267
-#: ../src/jarabe/journal/listview.py:369
2268
+#: ../src/jarabe/journal/listview.py:370
2269
msgid "Clear search"
2270
msgstr "Annulla ricerca"
2272
-#: ../src/jarabe/journal/misc.py:91
2273
+#: ../src/jarabe/journal/misc.py:93
2275
msgstr "Nessuna data"
2277
@@ -1017,24 +1018,24 @@ msgstr "Visualizza Sorgente"
2281
-#: ../src/jarabe/view/palettes.py:171
2282
+#: ../src/jarabe/view/palettes.py:174
2283
msgid "Remove favorite"
2284
msgstr "Rimuovi preferito"
2286
-#: ../src/jarabe/view/palettes.py:175
2287
+#: ../src/jarabe/view/palettes.py:178
2288
msgid "Make favorite"
2289
msgstr "Definisci preferito"
2291
-#: ../src/jarabe/view/palettes.py:238
2292
+#: ../src/jarabe/view/palettes.py:241
2293
msgid "Show contents"
2294
msgstr "Mostra i contenuti"
2296
-#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
2297
+#: ../src/jarabe/view/palettes.py:263 ../src/jarabe/view/palettes.py:313
2299
msgid "%(free_space)d MB Free"
2300
msgstr "%(free_space)d MB Liberi"
2302
-#: ../src/jarabe/view/palettes.py:285
2303
+#: ../src/jarabe/view/palettes.py:288
2307
@@ -1055,6 +1056,11 @@ msgstr "Sorgente della Attività"
2308
msgid "View source: %r"
2309
msgstr "Vedi codice sorgente: %r"
2312
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
2314
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; e Contributori."
2317
#~ msgstr "Documento"
2319
diff --git a/po/mn.po b/po/mn.po
2320
index 5beb279..3049ffb 100644
2323
@@ -6,13 +6,15 @@ msgid ""
2325
"Project-Id-Version: PACKAGE VERSION\n"
2326
"Report-Msgid-Bugs-To: \n"
2327
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
2328
-"PO-Revision-Date: 2009-02-17 16:37-0500\n"
2329
+"POT-Creation-Date: 2009-04-29 17:36-0400\n"
2330
+"PO-Revision-Date: 2009-09-08 17:43-0400\n"
2331
"Last-Translator: Odontsetseg Bat-Erdene <obat-erdene@suffolk.edu>\n"
2332
"Language-Team: LANGUAGE <LL@li.org>\n"
2334
"MIME-Version: 1.0\n"
2335
"Content-Type: text/plain; charset=UTF-8\n"
2336
"Content-Transfer-Encoding: 8bit\n"
2337
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2338
"X-Generator: Pootle 1.1.0rc2\n"
2340
#: ../extensions/cpsection/aboutme/__init__.py:24
2341
@@ -63,39 +65,39 @@ msgstr "Товшиж өнгөө солино уу:"
2342
msgid "About my Computer"
2343
msgstr "Миний компьютерийн тухай"
2345
-#: ../extensions/cpsection/aboutcomputer/model.py:26
2346
+#: ../extensions/cpsection/aboutcomputer/model.py:28
2347
msgid "Not available"
2348
msgstr "Боломжгүй байна"
2350
-#: ../extensions/cpsection/aboutcomputer/view.py:59
2351
+#: ../extensions/cpsection/aboutcomputer/view.py:60
2353
msgstr "Онцлох шинж"
2355
-#: ../extensions/cpsection/aboutcomputer/view.py:68
2356
+#: ../extensions/cpsection/aboutcomputer/view.py:69
2357
msgid "Serial Number:"
2358
msgstr "Цувралын дугаар:"
2360
-#: ../extensions/cpsection/aboutcomputer/view.py:90
2361
+#: ../extensions/cpsection/aboutcomputer/view.py:91
2363
msgstr "Програм хангамж"
2365
-#: ../extensions/cpsection/aboutcomputer/view.py:99
2366
+#: ../extensions/cpsection/aboutcomputer/view.py:100
2370
-#: ../extensions/cpsection/aboutcomputer/view.py:114
2371
+#: ../extensions/cpsection/aboutcomputer/view.py:115
2375
-#: ../extensions/cpsection/aboutcomputer/view.py:130
2376
+#: ../extensions/cpsection/aboutcomputer/view.py:131
2380
-#: ../extensions/cpsection/aboutcomputer/view.py:145
2381
+#: ../extensions/cpsection/aboutcomputer/view.py:146
2382
msgid "Wireless Firmware:"
2385
-#: ../extensions/cpsection/aboutcomputer/view.py:168
2386
+#: ../extensions/cpsection/aboutcomputer/view.py:169
2387
msgid "Copyright and License"
2390
@@ -104,7 +106,7 @@ msgid ""
2391
"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
2394
-#: ../extensions/cpsection/aboutcomputer/view.py:183
2395
+#: ../extensions/cpsection/aboutcomputer/view.py:184
2397
"Sugar is the graphical user interface that you are looking at. Sugar is free "
2398
"software, covered by the GNU General Public License, and you are welcome to "
2399
@@ -112,7 +114,7 @@ msgid ""
2403
-#: ../extensions/cpsection/aboutcomputer/view.py:195
2404
+#: ../extensions/cpsection/aboutcomputer/view.py:196
2405
msgid "Full license:"
2408
@@ -259,7 +261,7 @@ msgid ""
2410
"Хүчдэлийг дээд зэргээр хэмнэх (радио долгионыг хааснаар батерейг хэмнэх)"
2412
-#: ../extensions/deviceicon/battery.py:56
2413
+#: ../extensions/deviceicon/battery.py:58
2415
msgstr "Миний батарей"
2417
@@ -280,7 +282,7 @@ msgstr "Цэнэг маш бага байна"
2418
msgid "%(hour)d:%(min).2d remaining"
2419
msgstr "%(цаг)d:%(мин).2d үлдлээ"
2421
-#: ../extensions/deviceicon/battery.py:153
2422
+#: ../extensions/deviceicon/battery.py:152
2424
msgstr "Цэнэглэгдсэн"
2426
@@ -302,14 +304,14 @@ msgstr "Салгах..."
2427
# method for a device either (for various reasons) so this doesn't
2428
# have a good mapping
2429
#: ../extensions/deviceicon/network.py:109
2430
-#: ../src/jarabe/desktop/meshbox.py:246
2431
+#: ../src/jarabe/desktop/meshbox.py:250
2432
msgid "Connecting..."
2433
msgstr "Холбогдож байна..."
2435
# TODO: show the channel number
2436
#: ../extensions/deviceicon/network.py:113
2437
#: ../extensions/deviceicon/network.py:166
2438
-#: ../src/jarabe/desktop/meshbox.py:252
2439
+#: ../src/jarabe/desktop/meshbox.py:256
2443
@@ -325,28 +327,27 @@ msgstr "Утастай Сүлжээ"
2447
-#: ../extensions/deviceicon/speaker.py:46
2448
+#: ../extensions/deviceicon/speaker.py:59
2450
msgstr "Миний чанга яригч"
2452
-#: ../extensions/deviceicon/speaker.py:128
2453
+#: ../extensions/deviceicon/speaker.py:133
2455
msgstr "Дуутай болгох"
2457
-#: ../extensions/deviceicon/speaker.py:131
2458
+#: ../extensions/deviceicon/speaker.py:136
2460
msgstr "Дуугүй болгох"
2462
-#: ../extensions/globalkey/screenshot.py:50
2463
+#: ../extensions/globalkey/screenshot.py:51
2465
msgstr "Дэлгэцний зураг"
2467
-#: ../extensions/globalkey/viewsource.py:196
2468
+#: ../src/jarabe/view/viewsource.py:299
2470
msgid "View source: %r"
2473
-#: ../extensions/globalkey/viewsource.py:205
2474
#: ../src/jarabe/frame/zoomtoolbar.py:42
2476
msgstr "Үйл ажиллагаа"
2477
@@ -355,8 +356,8 @@ msgstr "Үйл ажиллагаа"
2479
msgstr "Бичиг баримт"
2481
-#: ../extensions/globalkey/viewsource.py:226
2482
-#: ../src/jarabe/journal/objectchooser.py:141
2483
+#: ../src/jarabe/journal/objectchooser.py:152
2484
+#: ../src/jarabe/view/viewsource.py:308
2488
@@ -524,24 +525,24 @@ msgstr ""
2489
msgid "To apply your changes you have to restart sugar.\n"
2490
msgstr "Өөрчлөлтийг идэвхжүүлэхийн тулд та дахин эхлүүлэх шаардлагатай.\n"
2492
-#: ../src/jarabe/controlpanel/gui.py:272
2493
+#: ../src/jarabe/controlpanel/gui.py:275
2497
-#: ../src/jarabe/controlpanel/gui.py:273
2498
+#: ../src/jarabe/controlpanel/gui.py:276
2499
#: ../src/jarabe/controlpanel/sectionview.py:42
2500
msgid "Changes require restart"
2501
msgstr "Өөрчлөхийн тулд дахин эхлүүлэх хэрэгтэй"
2503
-#: ../src/jarabe/controlpanel/gui.py:276
2504
+#: ../src/jarabe/controlpanel/gui.py:279
2505
msgid "Cancel changes"
2506
msgstr "Өөрчлөлтийг цуцлах"
2508
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
2509
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
2513
-#: ../src/jarabe/controlpanel/gui.py:285
2514
+#: ../src/jarabe/controlpanel/gui.py:288
2516
msgstr "Одоо эхлүүлэх үү"
2518
@@ -551,62 +552,62 @@ msgstr "Боллоо"
2520
#: ../src/jarabe/controlpanel/toolbar.py:115
2521
#: ../src/jarabe/desktop/homebox.py:111
2522
-#: ../src/jarabe/frame/activitiestray.py:683
2523
-#: ../src/jarabe/frame/activitiestray.py:762
2524
-#: ../src/jarabe/frame/activitiestray.py:790
2525
+#: ../src/jarabe/frame/activitiestray.py:726
2526
+#: ../src/jarabe/frame/activitiestray.py:821
2527
+#: ../src/jarabe/frame/activitiestray.py:849
2531
#: ../src/jarabe/controlpanel/toolbar.py:121
2532
-#: ../src/jarabe/desktop/favoritesview.py:334
2533
+#: ../src/jarabe/desktop/favoritesview.py:339
2537
# TRANS: label for the freeform layout in the favorites view
2538
#. TRANS: label for the freeform layout in the favorites view
2539
-#: ../src/jarabe/desktop/favoriteslayout.py:114
2540
+#: ../src/jarabe/desktop/favoriteslayout.py:116
2542
msgstr "Дурын хэлбэр"
2544
# TRANS: label for the ring layout in the favorites view
2545
#. TRANS: label for the ring layout in the favorites view
2546
-#: ../src/jarabe/desktop/favoriteslayout.py:196
2547
+#: ../src/jarabe/desktop/favoriteslayout.py:198
2551
#. TRANS: label for the spiral layout in the favorites view
2552
-#: ../src/jarabe/desktop/favoriteslayout.py:341
2553
+#: ../src/jarabe/desktop/favoriteslayout.py:334
2557
#. TRANS: label for the box layout in the favorites view
2558
-#: ../src/jarabe/desktop/favoriteslayout.py:408
2559
+#: ../src/jarabe/desktop/favoriteslayout.py:401
2563
#. TRANS: label for the box layout in the favorites view
2564
-#: ../src/jarabe/desktop/favoriteslayout.py:449
2565
+#: ../src/jarabe/desktop/favoriteslayout.py:442
2569
-#: ../src/jarabe/desktop/favoritesview.py:325
2570
+#: ../src/jarabe/desktop/favoritesview.py:330
2571
msgid "Registration Failed"
2572
msgstr "Бүртгэл бүтэлгүйтлээ"
2574
-#: ../src/jarabe/desktop/favoritesview.py:326
2575
+#: ../src/jarabe/desktop/favoritesview.py:331
2580
-#: ../src/jarabe/desktop/favoritesview.py:328
2581
+#: ../src/jarabe/desktop/favoritesview.py:333
2582
msgid "Registration Successful"
2583
msgstr "Бүртгэл амжилттай"
2585
-#: ../src/jarabe/desktop/favoritesview.py:329
2586
+#: ../src/jarabe/desktop/favoritesview.py:334
2587
msgid "You are now registered with your school server."
2588
msgstr "Та одоо сургуулийн серверт бүртгэгдлээ."
2590
-#: ../src/jarabe/desktop/favoritesview.py:666
2591
+#: ../src/jarabe/desktop/favoritesview.py:674
2595
@@ -624,12 +625,13 @@ msgstr "Арилгахыг зөвшөөрөх: Та %s бүр мөсөн ари
2596
# self._stop_item.connect('activate', self._stop_item_activate_cb)
2597
# self.append_menu_item(self._stop_item)
2598
#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
2599
+#: ../src/jarabe/view/viewsource.py:218
2603
#: ../src/jarabe/desktop/homebox.py:76
2604
#: ../src/jarabe/journal/journaltoolbox.py:357
2605
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
2606
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
2610
@@ -681,81 +683,81 @@ msgstr ""
2611
msgid "Wireless Security:"
2614
-#: ../src/jarabe/desktop/meshbox.py:130
2615
+#: ../src/jarabe/desktop/meshbox.py:134
2619
-#: ../src/jarabe/desktop/meshbox.py:134
2620
+#: ../src/jarabe/desktop/meshbox.py:138
2624
# TRANS: Action label for resuming an activity.
2625
#. TRANS: Action label for resuming an activity.
2626
-#: ../src/jarabe/desktop/meshbox.py:440
2627
-#: ../src/jarabe/frame/activitiestray.py:707
2628
+#: ../src/jarabe/desktop/meshbox.py:444
2629
+#: ../src/jarabe/frame/activitiestray.py:761
2630
#: ../src/jarabe/journal/journaltoolbox.py:425
2631
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
2632
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
2636
-#: ../src/jarabe/desktop/meshbox.py:445
2637
-#: ../src/jarabe/frame/activitiestray.py:221
2638
+#: ../src/jarabe/desktop/meshbox.py:449
2639
+#: ../src/jarabe/frame/activitiestray.py:235
2643
-#: ../src/jarabe/desktop/schoolserver.py:18
2644
+#: ../src/jarabe/desktop/schoolserver.py:34
2645
msgid "Cannot obtain data needed for registration."
2648
-#: ../src/jarabe/desktop/schoolserver.py:35
2649
+#: ../src/jarabe/desktop/schoolserver.py:51
2650
msgid "Cannot connect to the server."
2653
-#: ../src/jarabe/desktop/schoolserver.py:40
2654
+#: ../src/jarabe/desktop/schoolserver.py:56
2655
msgid "The server could not complete the request."
2658
-#: ../src/jarabe/frame/activitiestray.py:226
2659
-#: ../src/jarabe/frame/activitiestray.py:655
2660
+#: ../src/jarabe/frame/activitiestray.py:240
2661
+#: ../src/jarabe/frame/activitiestray.py:698
2663
msgstr "Үл зөвшөөрөх"
2665
-#: ../src/jarabe/frame/activitiestray.py:608
2666
+#: ../src/jarabe/frame/activitiestray.py:650
2671
-#: ../src/jarabe/frame/activitiestray.py:610
2672
+#: ../src/jarabe/frame/activitiestray.py:652
2677
-#: ../src/jarabe/frame/activitiestray.py:612
2678
+#: ../src/jarabe/frame/activitiestray.py:654
2683
-#: ../src/jarabe/frame/activitiestray.py:629
2684
+#: ../src/jarabe/frame/activitiestray.py:671
2689
-#: ../src/jarabe/frame/activitiestray.py:640
2690
+#: ../src/jarabe/frame/activitiestray.py:683
2692
msgid "Transfer from %r"
2693
msgstr "%r-аас дамжуулах"
2695
-#: ../src/jarabe/frame/activitiestray.py:650
2696
+#: ../src/jarabe/frame/activitiestray.py:693
2700
-#: ../src/jarabe/frame/activitiestray.py:673
2701
-#: ../src/jarabe/frame/activitiestray.py:780
2702
+#: ../src/jarabe/frame/activitiestray.py:716
2703
+#: ../src/jarabe/frame/activitiestray.py:839
2708
-#: ../src/jarabe/frame/activitiestray.py:751
2709
+#: ../src/jarabe/frame/activitiestray.py:810
2711
msgid "Transfer to %r"
2712
msgstr "%r-д дамжуулах"
2713
@@ -773,7 +775,7 @@ msgstr "Нээх"
2715
msgstr "Сонгож нээх"
2717
-#: ../src/jarabe/frame/clipboardobject.py:47
2718
+#: ../src/jarabe/frame/clipboardobject.py:49
2722
@@ -802,9 +804,9 @@ msgstr "Буцах"
2726
-#: ../src/jarabe/journal/collapsedentry.py:243
2727
+#: ../src/jarabe/journal/collapsedentry.py:258
2728
#: ../src/jarabe/journal/expandedentry.py:159
2729
-#: ../src/jarabe/journal/palettes.py:57
2730
+#: ../src/jarabe/journal/palettes.py:66
2734
@@ -883,14 +885,14 @@ msgstr "Бүх юм"
2736
# TODO: Add "Start with" menu item
2737
#: ../src/jarabe/journal/journaltoolbox.py:347
2738
-#: ../src/jarabe/journal/palettes.py:81
2739
+#: ../src/jarabe/journal/palettes.py:90
2743
# TRANS: Action label for starting an entry.
2744
#. TRANS: Action label for starting an entry.
2745
#: ../src/jarabe/journal/journaltoolbox.py:428
2746
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
2747
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
2751
@@ -902,11 +904,11 @@ msgstr "Таны Журнал хоосон байна"
2752
msgid "No matching entries "
2753
msgstr "Тохирсон оролт алга "
2755
-#: ../src/jarabe/journal/listview.py:369
2756
+#: ../src/jarabe/journal/listview.py:370
2757
msgid "Clear search"
2758
msgstr "Хайлт арилгах"
2760
-#: ../src/jarabe/journal/misc.py:92
2761
+#: ../src/jarabe/journal/misc.py:93
2763
msgstr "Огноо байхгүй"
2765
@@ -922,93 +924,93 @@ msgstr ""
2766
msgid "Show Journal"
2767
msgstr "Журнал Үзүүлэх"
2769
-#: ../src/jarabe/journal/objectchooser.py:136
2770
+#: ../src/jarabe/journal/objectchooser.py:147
2771
msgid "Choose an object"
2772
msgstr "Обьектыг сонгох"
2774
-#: ../src/jarabe/journal/palettes.py:64
2775
+#: ../src/jarabe/journal/palettes.py:73
2779
-#: ../src/jarabe/journal/palettes.py:67
2780
+#: ../src/jarabe/journal/palettes.py:76
2784
-#: ../src/jarabe/journal/palettes.py:89
2785
+#: ../src/jarabe/journal/palettes.py:98
2789
-#: ../src/jarabe/journal/palettes.py:167
2790
+#: ../src/jarabe/journal/palettes.py:185
2791
msgid "No friends present"
2794
-#: ../src/jarabe/journal/palettes.py:172
2795
+#: ../src/jarabe/journal/palettes.py:190
2796
msgid "No valid connection found"
2799
-#: ../src/jarabe/journal/palettes.py:200
2800
+#: ../src/jarabe/journal/palettes.py:218
2801
msgid "No activity to resume entry"
2804
-#: ../src/jarabe/journal/palettes.py:202
2805
+#: ../src/jarabe/journal/palettes.py:220
2806
msgid "No activity to start entry"
2809
-#: ../src/jarabe/view/buddymenu.py:61
2810
+#: ../src/jarabe/view/buddymenu.py:62
2811
msgid "Remove friend"
2812
msgstr "Найзыг хасах"
2814
-#: ../src/jarabe/view/buddymenu.py:64
2815
+#: ../src/jarabe/view/buddymenu.py:65
2819
-#: ../src/jarabe/view/buddymenu.py:81
2820
+#: ../src/jarabe/view/buddymenu.py:82
2822
msgstr "Миний Тохиргоо"
2824
-#: ../src/jarabe/view/buddymenu.py:86
2825
+#: ../src/jarabe/view/buddymenu.py:90
2829
-#: ../src/jarabe/view/buddymenu.py:91
2830
+#: ../src/jarabe/view/buddymenu.py:95
2832
msgstr "Дахин эхлүүлэх"
2834
-#: ../src/jarabe/view/buddymenu.py:96
2835
+#: ../src/jarabe/view/buddymenu.py:100
2839
-#: ../src/jarabe/view/buddymenu.py:131
2840
+#: ../src/jarabe/view/buddymenu.py:135
2842
msgid "Invite to %s"
2845
-#: ../src/jarabe/view/palettes.py:43
2846
+#: ../src/jarabe/view/palettes.py:47
2848
msgstr "Эхэлж байна..."
2850
-#: ../src/jarabe/view/palettes.py:73
2851
+#: ../src/jarabe/view/palettes.py:84
2855
-#: ../src/jarabe/view/palettes.py:145
2856
+#: ../src/jarabe/view/palettes.py:174
2857
msgid "Remove favorite"
2858
msgstr "Дуртай зүйлийг устгах"
2860
-#: ../src/jarabe/view/palettes.py:149
2861
+#: ../src/jarabe/view/palettes.py:178
2862
msgid "Make favorite"
2863
msgstr "Дуртай зүйл болгох"
2865
-#: ../src/jarabe/view/palettes.py:201
2866
+#: ../src/jarabe/view/palettes.py:241
2867
msgid "Show contents"
2868
msgstr "Агуулгийг үзэх"
2870
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
2871
+#: ../src/jarabe/view/palettes.py:263 ../src/jarabe/view/palettes.py:313
2873
msgid "%(free_space)d MB Free"
2874
msgstr "%(free_space)d MB ашиглаагүй"
2876
-#: ../src/jarabe/view/palettes.py:248
2877
+#: ../src/jarabe/view/palettes.py:288
2881
@@ -1205,5 +1207,36 @@ msgstr "Салгах"
2885
+# Only show disconnect when there's a mesh device, because mesh takes
2886
+# priority over the normal wireless device. NM doesn't have a "disconnect"
2887
+# method for a device either (for various reasons) so this doesn't
2888
+# have a good mapping
2893
+#: ../src/jarabe/frame/activitiestray.py:750
2894
+#: ../src/jarabe/frame/activitiestray.py:873
2898
+#: ../src/jarabe/journal/palettes.py:107
2899
+msgid "View Details"
2902
+#. TODO: share-with, keep
2903
+#: ../src/jarabe/view/palettes.py:73
2904
+msgid "View Source"
2907
+#: ../src/jarabe/view/viewsource.py:208
2908
+msgid "Instance Source"
2911
+#: ../src/jarabe/view/viewsource.py:233
2915
+#: ../src/jarabe/view/viewsource.py:292
2916
+msgid "Activity Bundle Source"
2918
diff --git a/po/ne.po b/po/ne.po
2919
index 51b85ea..ba1562f 100644
2922
@@ -6,14 +6,16 @@ msgid ""
2924
"Project-Id-Version: PACKAGE VERSION\n"
2925
"Report-Msgid-Bugs-To: \n"
2926
-"POT-Creation-Date: 2009-02-21 00:30-0500\n"
2927
-"PO-Revision-Date: 2009-03-01 00:19-0500\n"
2928
-"Last-Translator: Pradosh Kharel <pradosh@olenepal.org>\n"
2929
+"POT-Creation-Date: 2009-04-29 17:36-0400\n"
2930
+"PO-Revision-Date: 2009-07-27 00:11-0400\n"
2931
+"Last-Translator: Daniel Drake <dsd@laptop.org>\n"
2932
"Language-Team: LANGUAGE <LL@li.org>\n"
2934
"MIME-Version: 1.0\n"
2935
"Content-Type: text/plain; charset=UTF-8\n"
2936
"Content-Transfer-Encoding: 8bit\n"
2937
-"X-Generator: Pootle 1.1.0rc2\n"
2938
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2939
+"X-Generator: Pootle 1.2.1\n"
2941
#: ../extensions/cpsection/aboutme/__init__.py:24
2943
@@ -63,50 +65,43 @@ msgstr "रङ्ग परिवर्तन गर्न क्लिक ग
2944
msgid "About my Computer"
2945
msgstr "मेरो कम्पयूटरको बारेमा"
2947
-#: ../extensions/cpsection/aboutcomputer/model.py:26
2948
+#: ../extensions/cpsection/aboutcomputer/model.py:28
2949
msgid "Not available"
2952
-#: ../extensions/cpsection/aboutcomputer/view.py:59
2953
+#: ../extensions/cpsection/aboutcomputer/view.py:60
2957
-#: ../extensions/cpsection/aboutcomputer/view.py:68
2958
+#: ../extensions/cpsection/aboutcomputer/view.py:69
2959
msgid "Serial Number:"
2960
msgstr "क्रमिक अङ्क"
2962
-#: ../extensions/cpsection/aboutcomputer/view.py:90
2963
+#: ../extensions/cpsection/aboutcomputer/view.py:91
2967
-#: ../extensions/cpsection/aboutcomputer/view.py:99
2968
+#: ../extensions/cpsection/aboutcomputer/view.py:100
2972
-#: ../extensions/cpsection/aboutcomputer/view.py:114
2973
+#: ../extensions/cpsection/aboutcomputer/view.py:115
2977
-#: ../extensions/cpsection/aboutcomputer/view.py:130
2978
+#: ../extensions/cpsection/aboutcomputer/view.py:131
2982
-#: ../extensions/cpsection/aboutcomputer/view.py:145
2983
+#: ../extensions/cpsection/aboutcomputer/view.py:146
2984
msgid "Wireless Firmware:"
2985
msgstr "तारबिनाको फर्मवेर:"
2987
-#: ../extensions/cpsection/aboutcomputer/view.py:168
2988
+#: ../extensions/cpsection/aboutcomputer/view.py:169
2989
msgid "Copyright and License"
2990
msgstr "कपिराइट र अनुमतिपत्र"
2992
-#: ../extensions/cpsection/aboutcomputer/view.py:176
2994
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
2996
-"© २००८ वान ल्यप् टप पर चाईल्ड असोसिएसन आइ एन सि; रेड ह्यट आइ एन सि; र अरु "
2999
-#: ../extensions/cpsection/aboutcomputer/view.py:183
3000
+#: ../extensions/cpsection/aboutcomputer/view.py:184
3002
"Sugar is the graphical user interface that you are looking at. Sugar is free "
3003
"software, covered by the GNU General Public License, and you are welcome to "
3004
@@ -117,7 +112,7 @@ msgstr ""
3005
"हो, सुगर ले जि एन यु जनरल पब्लिक अनुमति पत्र प्रयोग गर्छ र तपाईंले यसलाई "
3006
"परिवर्तन गरेर नियम अनुसार अरुलाई दिन सक्नुहुन्छ।"
3008
-#: ../extensions/cpsection/aboutcomputer/view.py:195
3009
+#: ../extensions/cpsection/aboutcomputer/view.py:196
3010
msgid "Full license:"
3011
msgstr "सम्पूर्ण अनुमति पत्र:"
3013
@@ -267,7 +262,7 @@ msgstr ""
3014
"अति किफायत शक्तिको प्रबन्धकर्ता (तार बिनाको रेडियो असमर्थ पार्छ, ब्याटरिको "
3017
-#: ../extensions/deviceicon/battery.py:56
3018
+#: ../extensions/deviceicon/battery.py:58
3022
@@ -286,7 +281,7 @@ msgstr "एकदमै थोरै शक्ति बाँकी छ"
3023
#: ../extensions/deviceicon/battery.py:149
3025
msgid "%(hour)d:%(min).2d remaining"
3026
-msgstr "%(घण्टा)d:%(मिनेट).2d बाँकी"
3027
+msgstr "%(hour)d:%(min).2d बाँकी"
3029
#: ../extensions/deviceicon/battery.py:152
3031
@@ -310,14 +305,14 @@ msgstr "जडान विच्छेद..."
3032
# method for a device either (for various reasons) so this doesn't
3033
# have a good mapping
3034
#: ../extensions/deviceicon/network.py:109
3035
-#: ../src/jarabe/desktop/meshbox.py:247
3036
+#: ../src/jarabe/desktop/meshbox.py:250
3037
msgid "Connecting..."
3038
msgstr "जडान हुदैछ..."
3040
# TODO: show the channel number
3041
#: ../extensions/deviceicon/network.py:113
3042
#: ../extensions/deviceicon/network.py:166
3043
-#: ../src/jarabe/desktop/meshbox.py:253
3044
+#: ../src/jarabe/desktop/meshbox.py:256
3048
@@ -333,19 +328,19 @@ msgstr "तार युक्त संजाल"
3052
-#: ../extensions/deviceicon/speaker.py:46
3053
+#: ../extensions/deviceicon/speaker.py:59
3055
msgstr "मेरो स्पिकरहरु"
3057
-#: ../extensions/deviceicon/speaker.py:128
3058
+#: ../extensions/deviceicon/speaker.py:133
3062
-#: ../extensions/deviceicon/speaker.py:131
3063
+#: ../extensions/deviceicon/speaker.py:136
3067
-#: ../extensions/globalkey/screenshot.py:50
3068
+#: ../extensions/globalkey/screenshot.py:51
3072
@@ -475,8 +470,8 @@ msgid ""
3073
"sugar-control-panel: WARNING, found more than one option with the same name: "
3076
-"सुगर-कन्ट्रोल-प्यानल: सावधान, त्यही नाम भएको एउटा भन्दा धेरै रोजाई भेटियो: "
3078
+"सुगर-कन्ट्रोल-प्यानल: सावधान, त्यही नाम भएको एउटा भन्दा धेरै रोजाई भेटियो: %"
3081
#: ../src/jarabe/controlpanel/cmd.py:30
3083
@@ -547,65 +542,65 @@ msgstr "भयो"
3085
#: ../src/jarabe/controlpanel/toolbar.py:115
3086
#: ../src/jarabe/desktop/homebox.py:111
3087
-#: ../src/jarabe/frame/activitiestray.py:687
3088
-#: ../src/jarabe/frame/activitiestray.py:766
3089
-#: ../src/jarabe/frame/activitiestray.py:794
3090
+#: ../src/jarabe/frame/activitiestray.py:726
3091
+#: ../src/jarabe/frame/activitiestray.py:821
3092
+#: ../src/jarabe/frame/activitiestray.py:849
3096
#: ../src/jarabe/controlpanel/toolbar.py:121
3097
-#: ../src/jarabe/desktop/favoritesview.py:338
3098
+#: ../src/jarabe/desktop/favoritesview.py:339
3102
# TRANS: label for the freeform layout in the favorites view
3103
#. TRANS: label for the freeform layout in the favorites view
3104
-#: ../src/jarabe/desktop/favoriteslayout.py:114
3105
+#: ../src/jarabe/desktop/favoriteslayout.py:116
3107
msgstr "स्वतन्त्र आकारको"
3109
# TRANS: label for the ring layout in the favorites view
3110
#. TRANS: label for the ring layout in the favorites view
3111
-#: ../src/jarabe/desktop/favoriteslayout.py:196
3112
+#: ../src/jarabe/desktop/favoriteslayout.py:198
3116
# TRANS: label for the spiral layout in the favorites view
3117
#. TRANS: label for the spiral layout in the favorites view
3118
-#: ../src/jarabe/desktop/favoriteslayout.py:332
3119
+#: ../src/jarabe/desktop/favoriteslayout.py:334
3123
# TRANS: label for the box layout in the favorites view
3124
#. TRANS: label for the box layout in the favorites view
3125
-#: ../src/jarabe/desktop/favoriteslayout.py:399
3126
+#: ../src/jarabe/desktop/favoriteslayout.py:401
3130
# TRANS: label for the box layout in the favorites view
3131
#. TRANS: label for the box layout in the favorites view
3132
-#: ../src/jarabe/desktop/favoriteslayout.py:440
3133
+#: ../src/jarabe/desktop/favoriteslayout.py:442
3137
-#: ../src/jarabe/desktop/favoritesview.py:329
3138
+#: ../src/jarabe/desktop/favoritesview.py:330
3139
msgid "Registration Failed"
3140
msgstr "दर्ता असफल भयो"
3142
-#: ../src/jarabe/desktop/favoritesview.py:330
3143
+#: ../src/jarabe/desktop/favoritesview.py:331
3148
-#: ../src/jarabe/desktop/favoritesview.py:332
3149
+#: ../src/jarabe/desktop/favoritesview.py:333
3150
msgid "Registration Successful"
3153
-#: ../src/jarabe/desktop/favoritesview.py:333
3154
+#: ../src/jarabe/desktop/favoritesview.py:334
3155
msgid "You are now registered with your school server."
3156
msgstr "अब तपाईँको नाम बिद्यालयको सर्भरमा दर्ता भइसक्यो।"
3158
-#: ../src/jarabe/desktop/favoritesview.py:668
3159
+#: ../src/jarabe/desktop/favoritesview.py:674
3163
@@ -677,25 +672,25 @@ msgstr "WPA र WPA2 निजी"
3164
msgid "Wireless Security:"
3165
msgstr "तारबिनाको लागि सुरक्षा"
3167
-#: ../src/jarabe/desktop/meshbox.py:131
3168
+#: ../src/jarabe/desktop/meshbox.py:134
3172
-#: ../src/jarabe/desktop/meshbox.py:135
3173
+#: ../src/jarabe/desktop/meshbox.py:138
3175
msgstr "विच्छेद भयो"
3177
# TRANS: Action label for resuming an activity.
3178
#. TRANS: Action label for resuming an activity.
3179
-#: ../src/jarabe/desktop/meshbox.py:441
3180
-#: ../src/jarabe/frame/activitiestray.py:711
3181
+#: ../src/jarabe/desktop/meshbox.py:444
3182
+#: ../src/jarabe/frame/activitiestray.py:761
3183
#: ../src/jarabe/journal/journaltoolbox.py:425
3184
#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
3188
-#: ../src/jarabe/desktop/meshbox.py:446
3189
-#: ../src/jarabe/frame/activitiestray.py:227
3190
+#: ../src/jarabe/desktop/meshbox.py:449
3191
+#: ../src/jarabe/frame/activitiestray.py:235
3195
@@ -711,47 +706,52 @@ msgstr "सर्भरमा जड़ान हुन सकेन।"
3196
msgid "The server could not complete the request."
3197
msgstr "सर्भरले अनुरोध पुरा गर्न सकेन।"
3199
-#: ../src/jarabe/frame/activitiestray.py:232
3200
-#: ../src/jarabe/frame/activitiestray.py:659
3201
+#: ../src/jarabe/frame/activitiestray.py:240
3202
+#: ../src/jarabe/frame/activitiestray.py:698
3206
-#: ../src/jarabe/frame/activitiestray.py:612
3207
+#: ../src/jarabe/frame/activitiestray.py:650
3212
-#: ../src/jarabe/frame/activitiestray.py:614
3213
+#: ../src/jarabe/frame/activitiestray.py:652
3218
-#: ../src/jarabe/frame/activitiestray.py:616
3219
+#: ../src/jarabe/frame/activitiestray.py:654
3224
-#: ../src/jarabe/frame/activitiestray.py:633
3225
+#: ../src/jarabe/frame/activitiestray.py:671
3230
-#: ../src/jarabe/frame/activitiestray.py:644
3231
+#: ../src/jarabe/frame/activitiestray.py:683
3233
msgid "Transfer from %r"
3234
msgstr "%r बाट सार्नुहोस"
3236
-#: ../src/jarabe/frame/activitiestray.py:654
3237
+#: ../src/jarabe/frame/activitiestray.py:693
3241
-#: ../src/jarabe/frame/activitiestray.py:677
3242
-#: ../src/jarabe/frame/activitiestray.py:784
3243
+#: ../src/jarabe/frame/activitiestray.py:716
3244
+#: ../src/jarabe/frame/activitiestray.py:839
3249
-#: ../src/jarabe/frame/activitiestray.py:755
3250
+#: ../src/jarabe/frame/activitiestray.py:750
3251
+#: ../src/jarabe/frame/activitiestray.py:873
3255
+#: ../src/jarabe/frame/activitiestray.py:810
3257
msgid "Transfer to %r"
3258
msgstr "%r मा सार्नुहोस"
3259
@@ -902,11 +902,11 @@ msgstr "तिम्रो पंजिका खाली छ"
3260
msgid "No matching entries "
3261
msgstr "मिल्ने लेखा छैन "
3263
-#: ../src/jarabe/journal/listview.py:369
3264
+#: ../src/jarabe/journal/listview.py:370
3265
msgid "Clear search"
3266
msgstr "खोजलाई सफा गर"
3268
-#: ../src/jarabe/journal/misc.py:91
3269
+#: ../src/jarabe/journal/misc.py:93
3273
@@ -1005,24 +1005,24 @@ msgstr "स्रोत हेर"
3277
-#: ../src/jarabe/view/palettes.py:171
3278
+#: ../src/jarabe/view/palettes.py:174
3279
msgid "Remove favorite"
3282
-#: ../src/jarabe/view/palettes.py:175
3283
+#: ../src/jarabe/view/palettes.py:178
3284
msgid "Make favorite"
3287
-#: ../src/jarabe/view/palettes.py:238
3288
+#: ../src/jarabe/view/palettes.py:241
3289
msgid "Show contents"
3290
msgstr "वस्तुहरु देखाउ"
3292
-#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
3293
+#: ../src/jarabe/view/palettes.py:263 ../src/jarabe/view/palettes.py:313
3295
msgid "%(free_space)d MB Free"
3296
-msgstr "%(खालि॒_ठाउँ )d MB खालि"
3297
+msgstr "%(free_space)d MB खालि"
3299
-#: ../src/jarabe/view/palettes.py:285
3300
+#: ../src/jarabe/view/palettes.py:288
3304
@@ -1043,6 +1043,12 @@ msgstr "क्रियाकलाप बन्डलको मुल"
3305
msgid "View source: %r"
3306
msgstr "स्रोत हेर : %r"
3309
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
3311
+#~ "© २००८ वान ल्यप् टप पर चाईल्ड असोसिएसन आइ एन सि; रेड ह्यट आइ एन सि; र अरु "
3315
#~ msgstr "कागतपत्र"
3317
diff --git a/po/nl.po b/po/nl.po
3318
index 3bb2cb6..511168d 100644
3321
@@ -6,14 +6,16 @@ msgid ""
3323
"Project-Id-Version: PACKAGE VERSION\n"
3324
"Report-Msgid-Bugs-To: \n"
3325
-"POT-Creation-Date: 2009-02-21 00:30-0500\n"
3326
-"PO-Revision-Date: 2009-03-01 13:50-0500\n"
3327
+"POT-Creation-Date: 2009-04-29 17:36-0400\n"
3328
+"PO-Revision-Date: 2009-05-21 02:43-0400\n"
3329
"Last-Translator: Myckel Habets <myckel@sdf.lonestar.org>\n"
3330
"Language-Team: LANGUAGE <LL@li.org>\n"
3332
"MIME-Version: 1.0\n"
3333
"Content-Type: text/plain; charset=UTF-8\n"
3334
"Content-Transfer-Encoding: 8bit\n"
3335
-"X-Generator: Pootle 1.1.0rc2\n"
3336
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
3337
+"X-Generator: Pootle 1.2.1\n"
3339
#: ../extensions/cpsection/aboutme/__init__.py:24
3341
@@ -63,50 +65,43 @@ msgstr "Klik om de kleur te veranderen:"
3342
msgid "About my Computer"
3343
msgstr "Over mijn computer"
3345
-#: ../extensions/cpsection/aboutcomputer/model.py:26
3346
+#: ../extensions/cpsection/aboutcomputer/model.py:28
3347
msgid "Not available"
3348
msgstr "Niet beschikbaar"
3350
-#: ../extensions/cpsection/aboutcomputer/view.py:59
3351
+#: ../extensions/cpsection/aboutcomputer/view.py:60
3355
-#: ../extensions/cpsection/aboutcomputer/view.py:68
3356
+#: ../extensions/cpsection/aboutcomputer/view.py:69
3357
msgid "Serial Number:"
3358
msgstr "Serienummer:"
3360
-#: ../extensions/cpsection/aboutcomputer/view.py:90
3361
+#: ../extensions/cpsection/aboutcomputer/view.py:91
3365
-#: ../extensions/cpsection/aboutcomputer/view.py:99
3366
+#: ../extensions/cpsection/aboutcomputer/view.py:100
3370
-#: ../extensions/cpsection/aboutcomputer/view.py:114
3371
+#: ../extensions/cpsection/aboutcomputer/view.py:115
3375
-#: ../extensions/cpsection/aboutcomputer/view.py:130
3376
+#: ../extensions/cpsection/aboutcomputer/view.py:131
3380
-#: ../extensions/cpsection/aboutcomputer/view.py:145
3381
+#: ../extensions/cpsection/aboutcomputer/view.py:146
3382
msgid "Wireless Firmware:"
3383
msgstr "Firmware draadloos netwerk:"
3385
-#: ../extensions/cpsection/aboutcomputer/view.py:168
3386
+#: ../extensions/cpsection/aboutcomputer/view.py:169
3387
msgid "Copyright and License"
3388
msgstr "Copyright en licentie"
3390
-#: ../extensions/cpsection/aboutcomputer/view.py:176
3392
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
3394
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; en anderen die "
3395
-"bijgedragen hebben."
3397
-#: ../extensions/cpsection/aboutcomputer/view.py:183
3398
+#: ../extensions/cpsection/aboutcomputer/view.py:184
3400
"Sugar is the graphical user interface that you are looking at. Sugar is free "
3401
"software, covered by the GNU General Public License, and you are welcome to "
3402
@@ -118,7 +113,7 @@ msgstr ""
3403
"je mag het aanpassen en/of kopieën distribueren onder de condities zoals "
3404
"vermeld in de licentie."
3406
-#: ../extensions/cpsection/aboutcomputer/view.py:195
3407
+#: ../extensions/cpsection/aboutcomputer/view.py:196
3408
msgid "Full license:"
3409
msgstr "Volledige licentie:"
3411
@@ -271,7 +266,7 @@ msgstr ""
3412
"Extreem energiebeheer (deactiveert draadloze zender, verhoogt gebruiksduur "
3415
-#: ../extensions/deviceicon/battery.py:56
3416
+#: ../extensions/deviceicon/battery.py:58
3420
@@ -306,14 +301,14 @@ msgid "Disconnect..."
3421
msgstr "Verbinding verbreken..."
3423
#: ../extensions/deviceicon/network.py:109
3424
-#: ../src/jarabe/desktop/meshbox.py:247
3425
+#: ../src/jarabe/desktop/meshbox.py:250
3426
msgid "Connecting..."
3427
msgstr "Verbinden..."
3429
# TODO: show the channel number
3430
#: ../extensions/deviceicon/network.py:113
3431
#: ../extensions/deviceicon/network.py:166
3432
-#: ../src/jarabe/desktop/meshbox.py:253
3433
+#: ../src/jarabe/desktop/meshbox.py:256
3437
@@ -329,19 +324,19 @@ msgstr "Bedraad netwerk"
3441
-#: ../extensions/deviceicon/speaker.py:46
3442
+#: ../extensions/deviceicon/speaker.py:59
3444
msgstr "Mijn Speakers"
3446
-#: ../extensions/deviceicon/speaker.py:128
3447
+#: ../extensions/deviceicon/speaker.py:133
3451
-#: ../extensions/deviceicon/speaker.py:131
3452
+#: ../extensions/deviceicon/speaker.py:136
3456
-#: ../extensions/globalkey/screenshot.py:50
3457
+#: ../extensions/globalkey/screenshot.py:51
3459
msgstr "Schermafdruk"
3461
@@ -545,65 +540,65 @@ msgstr "Klaar"
3463
#: ../src/jarabe/controlpanel/toolbar.py:115
3464
#: ../src/jarabe/desktop/homebox.py:111
3465
-#: ../src/jarabe/frame/activitiestray.py:687
3466
-#: ../src/jarabe/frame/activitiestray.py:766
3467
-#: ../src/jarabe/frame/activitiestray.py:794
3468
+#: ../src/jarabe/frame/activitiestray.py:726
3469
+#: ../src/jarabe/frame/activitiestray.py:821
3470
+#: ../src/jarabe/frame/activitiestray.py:849
3474
#: ../src/jarabe/controlpanel/toolbar.py:121
3475
-#: ../src/jarabe/desktop/favoritesview.py:338
3476
+#: ../src/jarabe/desktop/favoritesview.py:339
3480
# TRANS: label for the freeform layout in the favorites view
3481
#. TRANS: label for the freeform layout in the favorites view
3482
-#: ../src/jarabe/desktop/favoriteslayout.py:114
3483
+#: ../src/jarabe/desktop/favoriteslayout.py:116
3487
# TRANS: label for the ring layout in the favorites view
3488
#. TRANS: label for the ring layout in the favorites view
3489
-#: ../src/jarabe/desktop/favoriteslayout.py:196
3490
+#: ../src/jarabe/desktop/favoriteslayout.py:198
3494
# TRANS: label for the spiral layout in the favorites view
3495
#. TRANS: label for the spiral layout in the favorites view
3496
-#: ../src/jarabe/desktop/favoriteslayout.py:332
3497
+#: ../src/jarabe/desktop/favoriteslayout.py:334
3501
# TRANS: label for the box layout in the favorites view
3502
#. TRANS: label for the box layout in the favorites view
3503
-#: ../src/jarabe/desktop/favoriteslayout.py:399
3504
+#: ../src/jarabe/desktop/favoriteslayout.py:401
3508
# TRANS: label for the box layout in the favorites view
3509
#. TRANS: label for the box layout in the favorites view
3510
-#: ../src/jarabe/desktop/favoriteslayout.py:440
3511
+#: ../src/jarabe/desktop/favoriteslayout.py:442
3515
-#: ../src/jarabe/desktop/favoritesview.py:329
3516
+#: ../src/jarabe/desktop/favoritesview.py:330
3517
msgid "Registration Failed"
3518
msgstr "Registratie mislukt"
3520
-#: ../src/jarabe/desktop/favoritesview.py:330
3521
+#: ../src/jarabe/desktop/favoritesview.py:331
3526
-#: ../src/jarabe/desktop/favoritesview.py:332
3527
+#: ../src/jarabe/desktop/favoritesview.py:333
3528
msgid "Registration Successful"
3529
msgstr "Registratie succesvol uitgevoerd"
3531
-#: ../src/jarabe/desktop/favoritesview.py:333
3532
+#: ../src/jarabe/desktop/favoritesview.py:334
3533
msgid "You are now registered with your school server."
3534
msgstr "Je bent nu geregistreerd bij je schoolserver."
3536
-#: ../src/jarabe/desktop/favoritesview.py:668
3537
+#: ../src/jarabe/desktop/favoritesview.py:674
3539
msgstr "Registreren"
3541
@@ -678,25 +673,25 @@ msgstr "WPA en WPA 2 Persoonlijk"
3542
msgid "Wireless Security:"
3543
msgstr "Draadloze netwerkbeveiliging:"
3545
-#: ../src/jarabe/desktop/meshbox.py:131
3546
+#: ../src/jarabe/desktop/meshbox.py:134
3550
-#: ../src/jarabe/desktop/meshbox.py:135
3551
+#: ../src/jarabe/desktop/meshbox.py:138
3553
msgstr "Verbinding verbreken"
3555
# TRANS: Action label for resuming an activity.
3556
#. TRANS: Action label for resuming an activity.
3557
-#: ../src/jarabe/desktop/meshbox.py:441
3558
-#: ../src/jarabe/frame/activitiestray.py:711
3559
+#: ../src/jarabe/desktop/meshbox.py:444
3560
+#: ../src/jarabe/frame/activitiestray.py:761
3561
#: ../src/jarabe/journal/journaltoolbox.py:425
3562
#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
3566
-#: ../src/jarabe/desktop/meshbox.py:446
3567
-#: ../src/jarabe/frame/activitiestray.py:227
3568
+#: ../src/jarabe/desktop/meshbox.py:449
3569
+#: ../src/jarabe/frame/activitiestray.py:235
3573
@@ -713,47 +708,52 @@ msgstr "Kan niet met de server verbinden."
3574
msgid "The server could not complete the request."
3575
msgstr "De server kon de aanvraag niet voltooien."
3577
-#: ../src/jarabe/frame/activitiestray.py:232
3578
-#: ../src/jarabe/frame/activitiestray.py:659
3579
+#: ../src/jarabe/frame/activitiestray.py:240
3580
+#: ../src/jarabe/frame/activitiestray.py:698
3584
-#: ../src/jarabe/frame/activitiestray.py:612
3585
+#: ../src/jarabe/frame/activitiestray.py:650
3590
-#: ../src/jarabe/frame/activitiestray.py:614
3591
+#: ../src/jarabe/frame/activitiestray.py:652
3596
-#: ../src/jarabe/frame/activitiestray.py:616
3597
+#: ../src/jarabe/frame/activitiestray.py:654
3602
-#: ../src/jarabe/frame/activitiestray.py:633
3603
+#: ../src/jarabe/frame/activitiestray.py:671
3608
-#: ../src/jarabe/frame/activitiestray.py:644
3609
+#: ../src/jarabe/frame/activitiestray.py:683
3611
msgid "Transfer from %r"
3612
msgstr "Overdragen van %r"
3614
-#: ../src/jarabe/frame/activitiestray.py:654
3615
+#: ../src/jarabe/frame/activitiestray.py:693
3619
-#: ../src/jarabe/frame/activitiestray.py:677
3620
-#: ../src/jarabe/frame/activitiestray.py:784
3621
+#: ../src/jarabe/frame/activitiestray.py:716
3622
+#: ../src/jarabe/frame/activitiestray.py:839
3627
-#: ../src/jarabe/frame/activitiestray.py:755
3628
+#: ../src/jarabe/frame/activitiestray.py:750
3629
+#: ../src/jarabe/frame/activitiestray.py:873
3633
+#: ../src/jarabe/frame/activitiestray.py:810
3635
msgid "Transfer to %r"
3636
msgstr "Overdragen naar %r"
3637
@@ -904,11 +904,11 @@ msgstr "Je dagboek is leeg"
3638
msgid "No matching entries "
3639
msgstr "Geen overeenkomende ingangen "
3641
-#: ../src/jarabe/journal/listview.py:369
3642
+#: ../src/jarabe/journal/listview.py:370
3643
msgid "Clear search"
3644
msgstr "Zoekopdracht wissen"
3646
-#: ../src/jarabe/journal/misc.py:91
3647
+#: ../src/jarabe/journal/misc.py:93
3651
@@ -1007,24 +1007,24 @@ msgstr "Bron weergeven"
3655
-#: ../src/jarabe/view/palettes.py:171
3656
+#: ../src/jarabe/view/palettes.py:174
3657
msgid "Remove favorite"
3658
msgstr "Verwijder favoriet"
3660
-#: ../src/jarabe/view/palettes.py:175
3661
+#: ../src/jarabe/view/palettes.py:178
3662
msgid "Make favorite"
3663
msgstr "Maak favoriet"
3665
-#: ../src/jarabe/view/palettes.py:238
3666
+#: ../src/jarabe/view/palettes.py:241
3667
msgid "Show contents"
3668
msgstr "Inhoud weergeven"
3670
-#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
3671
+#: ../src/jarabe/view/palettes.py:263 ../src/jarabe/view/palettes.py:313
3673
msgid "%(free_space)d MB Free"
3674
msgstr "%(free_space)d MB vrij"
3676
-#: ../src/jarabe/view/palettes.py:285
3677
+#: ../src/jarabe/view/palettes.py:288
3679
msgstr "Loskoppelen"
3681
@@ -1045,6 +1045,12 @@ msgstr "Activiteitsbundel Bron"
3682
msgid "View source: %r"
3683
msgstr "Bron weergeven: %r"
3686
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
3688
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; en anderen die "
3689
+#~ "bijgedragen hebben."
3692
#~ msgstr "Document"
3694
diff --git a/po/zh_TW.po b/po/zh_TW.po
3695
index d71e80d..c35926f 100644
3698
@@ -6,14 +6,16 @@ msgid ""
3700
"Project-Id-Version: Sugar\n"
3701
"Report-Msgid-Bugs-To: \n"
3702
-"POT-Creation-Date: 2009-02-21 00:30-0500\n"
3703
-"PO-Revision-Date: 2009-02-27 20:17-0500\n"
3704
+"POT-Creation-Date: 2009-04-29 17:36-0400\n"
3705
+"PO-Revision-Date: 2009-05-10 10:59-0400\n"
3706
"Last-Translator: Yuan Chao <yuanchao@gmail.com>\n"
3707
"Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
3708
+"Language: zh_TW\n"
3709
"MIME-Version: 1.0\n"
3710
"Content-Type: text/plain; charset=UTF-8\n"
3711
"Content-Transfer-Encoding: 8bit\n"
3712
-"X-Generator: Pootle 1.1.0rc2\n"
3713
+"Plural-Forms: nplurals=1; plural=0;\n"
3714
+"X-Generator: Pootle 1.2.1\n"
3716
#: ../extensions/cpsection/aboutme/__init__.py:24
3718
@@ -63,48 +65,43 @@ msgstr "點選改變顏色"
3719
msgid "About my Computer"
3722
-#: ../extensions/cpsection/aboutcomputer/model.py:26
3723
+#: ../extensions/cpsection/aboutcomputer/model.py:28
3724
msgid "Not available"
3727
-#: ../extensions/cpsection/aboutcomputer/view.py:59
3728
+#: ../extensions/cpsection/aboutcomputer/view.py:60
3732
-#: ../extensions/cpsection/aboutcomputer/view.py:68
3733
+#: ../extensions/cpsection/aboutcomputer/view.py:69
3734
msgid "Serial Number:"
3737
-#: ../extensions/cpsection/aboutcomputer/view.py:90
3738
+#: ../extensions/cpsection/aboutcomputer/view.py:91
3742
-#: ../extensions/cpsection/aboutcomputer/view.py:99
3743
+#: ../extensions/cpsection/aboutcomputer/view.py:100
3747
-#: ../extensions/cpsection/aboutcomputer/view.py:114
3748
+#: ../extensions/cpsection/aboutcomputer/view.py:115
3752
-#: ../extensions/cpsection/aboutcomputer/view.py:130
3753
+#: ../extensions/cpsection/aboutcomputer/view.py:131
3757
-#: ../extensions/cpsection/aboutcomputer/view.py:145
3758
+#: ../extensions/cpsection/aboutcomputer/view.py:146
3759
msgid "Wireless Firmware:"
3762
-#: ../extensions/cpsection/aboutcomputer/view.py:168
3763
+#: ../extensions/cpsection/aboutcomputer/view.py:169
3764
msgid "Copyright and License"
3767
-#: ../extensions/cpsection/aboutcomputer/view.py:176
3769
-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
3770
-msgstr "© 2008 每童一機 公司; 紅帽 公司; 以及其他的貢獻者"
3772
-#: ../extensions/cpsection/aboutcomputer/view.py:183
3773
+#: ../extensions/cpsection/aboutcomputer/view.py:184
3775
"Sugar is the graphical user interface that you are looking at. Sugar is free "
3776
"software, covered by the GNU General Public License, and you are welcome to "
3777
@@ -112,7 +109,7 @@ msgid ""
3779
msgstr "Sugar 是您目前所看到的使用者界面,Sugar 是一個自由軟體,以 GNU 的 GPL 授權。歡迎您依據授權條例修改與散佈本軟體。"
3781
-#: ../extensions/cpsection/aboutcomputer/view.py:195
3782
+#: ../extensions/cpsection/aboutcomputer/view.py:196
3783
msgid "Full license:"
3786
@@ -258,7 +255,7 @@ msgid ""
3787
"Extreme power management (disableswireless radio, increases battery life)"
3788
msgstr "積極電源管理模式 (關閉無線網路,增加電池使用時間)"
3790
-#: ../extensions/deviceicon/battery.py:56
3791
+#: ../extensions/deviceicon/battery.py:58
3795
@@ -301,14 +298,14 @@ msgstr "切斷連線…"
3796
# method for a device either (for various reasons) so this doesn't
3797
# have a good mapping
3798
#: ../extensions/deviceicon/network.py:109
3799
-#: ../src/jarabe/desktop/meshbox.py:247
3800
+#: ../src/jarabe/desktop/meshbox.py:250
3801
msgid "Connecting..."
3804
# TODO: show the channel number
3805
#: ../extensions/deviceicon/network.py:113
3806
#: ../extensions/deviceicon/network.py:166
3807
-#: ../src/jarabe/desktop/meshbox.py:253
3808
+#: ../src/jarabe/desktop/meshbox.py:256
3812
@@ -324,19 +321,19 @@ msgstr "有線網路"
3816
-#: ../extensions/deviceicon/speaker.py:46
3817
+#: ../extensions/deviceicon/speaker.py:59
3821
-#: ../extensions/deviceicon/speaker.py:128
3822
+#: ../extensions/deviceicon/speaker.py:133
3826
-#: ../extensions/deviceicon/speaker.py:131
3827
+#: ../extensions/deviceicon/speaker.py:136
3831
-#: ../extensions/globalkey/screenshot.py:50
3832
+#: ../extensions/globalkey/screenshot.py:51
3836
@@ -531,65 +528,65 @@ msgstr "完成"
3838
#: ../src/jarabe/controlpanel/toolbar.py:115
3839
#: ../src/jarabe/desktop/homebox.py:111
3840
-#: ../src/jarabe/frame/activitiestray.py:687
3841
-#: ../src/jarabe/frame/activitiestray.py:766
3842
-#: ../src/jarabe/frame/activitiestray.py:794
3843
+#: ../src/jarabe/frame/activitiestray.py:726
3844
+#: ../src/jarabe/frame/activitiestray.py:821
3845
+#: ../src/jarabe/frame/activitiestray.py:849
3849
#: ../src/jarabe/controlpanel/toolbar.py:121
3850
-#: ../src/jarabe/desktop/favoritesview.py:338
3851
+#: ../src/jarabe/desktop/favoritesview.py:339
3855
# TRANS: label for the freeform layout in the favorites view
3856
#. TRANS: label for the freeform layout in the favorites view
3857
-#: ../src/jarabe/desktop/favoriteslayout.py:114
3858
+#: ../src/jarabe/desktop/favoriteslayout.py:116
3862
# TRANS: label for the ring layout in the favorites view
3863
#. TRANS: label for the ring layout in the favorites view
3864
-#: ../src/jarabe/desktop/favoriteslayout.py:196
3865
+#: ../src/jarabe/desktop/favoriteslayout.py:198
3869
# TRANS: label for the spiral layout in the favorites view
3870
#. TRANS: label for the spiral layout in the favorites view
3871
-#: ../src/jarabe/desktop/favoriteslayout.py:332
3872
+#: ../src/jarabe/desktop/favoriteslayout.py:334
3876
# TRANS: label for the box layout in the favorites view
3877
#. TRANS: label for the box layout in the favorites view
3878
-#: ../src/jarabe/desktop/favoriteslayout.py:399
3879
+#: ../src/jarabe/desktop/favoriteslayout.py:401
3883
# TRANS: label for the box layout in the favorites view
3884
#. TRANS: label for the box layout in the favorites view
3885
-#: ../src/jarabe/desktop/favoriteslayout.py:440
3886
+#: ../src/jarabe/desktop/favoriteslayout.py:442
3890
-#: ../src/jarabe/desktop/favoritesview.py:329
3891
+#: ../src/jarabe/desktop/favoritesview.py:330
3892
msgid "Registration Failed"
3895
-#: ../src/jarabe/desktop/favoritesview.py:330
3896
+#: ../src/jarabe/desktop/favoritesview.py:331
3901
-#: ../src/jarabe/desktop/favoritesview.py:332
3902
+#: ../src/jarabe/desktop/favoritesview.py:333
3903
msgid "Registration Successful"
3906
-#: ../src/jarabe/desktop/favoritesview.py:333
3907
+#: ../src/jarabe/desktop/favoritesview.py:334
3908
msgid "You are now registered with your school server."
3909
msgstr "您已經成功註冊到校園主機"
3911
-#: ../src/jarabe/desktop/favoritesview.py:668
3912
+#: ../src/jarabe/desktop/favoritesview.py:674
3916
@@ -661,25 +658,25 @@ msgstr "個人的 WPA & WPA2 加密"
3917
msgid "Wireless Security:"
3920
-#: ../src/jarabe/desktop/meshbox.py:131
3921
+#: ../src/jarabe/desktop/meshbox.py:134
3925
-#: ../src/jarabe/desktop/meshbox.py:135
3926
+#: ../src/jarabe/desktop/meshbox.py:138
3930
# TRANS: Action label for resuming an activity.
3931
#. TRANS: Action label for resuming an activity.
3932
-#: ../src/jarabe/desktop/meshbox.py:441
3933
-#: ../src/jarabe/frame/activitiestray.py:711
3934
+#: ../src/jarabe/desktop/meshbox.py:444
3935
+#: ../src/jarabe/frame/activitiestray.py:761
3936
#: ../src/jarabe/journal/journaltoolbox.py:425
3937
#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
3941
-#: ../src/jarabe/desktop/meshbox.py:446
3942
-#: ../src/jarabe/frame/activitiestray.py:227
3943
+#: ../src/jarabe/desktop/meshbox.py:449
3944
+#: ../src/jarabe/frame/activitiestray.py:235
3948
@@ -695,47 +692,52 @@ msgstr "無法連線到伺服器"
3949
msgid "The server could not complete the request."
3950
msgstr "伺服器無法完成查尋動作"
3952
-#: ../src/jarabe/frame/activitiestray.py:232
3953
-#: ../src/jarabe/frame/activitiestray.py:659
3954
+#: ../src/jarabe/frame/activitiestray.py:240
3955
+#: ../src/jarabe/frame/activitiestray.py:698
3959
-#: ../src/jarabe/frame/activitiestray.py:612
3960
+#: ../src/jarabe/frame/activitiestray.py:650
3965
-#: ../src/jarabe/frame/activitiestray.py:614
3966
+#: ../src/jarabe/frame/activitiestray.py:652
3971
-#: ../src/jarabe/frame/activitiestray.py:616
3972
+#: ../src/jarabe/frame/activitiestray.py:654
3977
-#: ../src/jarabe/frame/activitiestray.py:633
3978
+#: ../src/jarabe/frame/activitiestray.py:671
3983
-#: ../src/jarabe/frame/activitiestray.py:644
3984
+#: ../src/jarabe/frame/activitiestray.py:683
3986
msgid "Transfer from %r"
3989
-#: ../src/jarabe/frame/activitiestray.py:654
3990
+#: ../src/jarabe/frame/activitiestray.py:693
3994
-#: ../src/jarabe/frame/activitiestray.py:677
3995
-#: ../src/jarabe/frame/activitiestray.py:784
3996
+#: ../src/jarabe/frame/activitiestray.py:716
3997
+#: ../src/jarabe/frame/activitiestray.py:839
4002
-#: ../src/jarabe/frame/activitiestray.py:755
4003
+#: ../src/jarabe/frame/activitiestray.py:750
4004
+#: ../src/jarabe/frame/activitiestray.py:873
4008
+#: ../src/jarabe/frame/activitiestray.py:810
4010
msgid "Transfer to %r"
4012
@@ -886,11 +888,11 @@ msgstr "空白的日誌內容"
4013
msgid "No matching entries "
4016
-#: ../src/jarabe/journal/listview.py:369
4017
+#: ../src/jarabe/journal/listview.py:370
4018
msgid "Clear search"
4021
-#: ../src/jarabe/journal/misc.py:91
4022
+#: ../src/jarabe/journal/misc.py:93
4026
@@ -989,24 +991,24 @@ msgstr "檢視原始碼"
4030
-#: ../src/jarabe/view/palettes.py:171
4031
+#: ../src/jarabe/view/palettes.py:174
4032
msgid "Remove favorite"
4035
-#: ../src/jarabe/view/palettes.py:175
4036
+#: ../src/jarabe/view/palettes.py:178
4037
msgid "Make favorite"
4040
-#: ../src/jarabe/view/palettes.py:238
4041
+#: ../src/jarabe/view/palettes.py:241
4042
msgid "Show contents"
4045
-#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
4046
+#: ../src/jarabe/view/palettes.py:263 ../src/jarabe/view/palettes.py:313
4048
msgid "%(free_space)d MB Free"
4049
msgstr "剩餘 %(free_space)d MB 空間"
4051
-#: ../src/jarabe/view/palettes.py:285
4052
+#: ../src/jarabe/view/palettes.py:288
4056
@@ -1027,6 +1029,10 @@ msgstr "預裝活動原始碼"
4057
msgid "View source: %r"
4061
+#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
4062
+#~ msgstr "© 2008 每童一機 公司; 紅帽 公司; 以及其他的貢獻者"
4067
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
4068
index 4ca751c..bc0ba14 100644
4069
--- a/src/jarabe/journal/journalactivity.py
4070
+++ b/src/jarabe/journal/journalactivity.py
4071
@@ -288,6 +288,7 @@ class JournalActivity(Window):
4073
if metadata['mime_type'] == JournalEntryBundle.MIME_TYPE:
4074
model.delete(object_id)
4077
metadata['bundle_id'] = bundle.get_bundle_id()
4078
model.write(metadata)
4079
diff --git a/src/jarabe/journal/journalentrybundle.py b/src/jarabe/journal/journalentrybundle.py
4080
index 5d4086c..ebe7ec3 100644
4081
--- a/src/jarabe/journal/journalentrybundle.py
4082
+++ b/src/jarabe/journal/journalentrybundle.py
4083
@@ -40,7 +40,7 @@ class JournalEntryBundle(Bundle):
4084
def __init__(self, path):
4085
Bundle.__init__(self, path)
4087
- def install(self):
4088
+ def install(self, install_path):
4089
if os.environ.has_key('SUGAR_ACTIVITY_ROOT'):
4090
install_dir = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'],
4092
@@ -62,6 +62,9 @@ class JournalEntryBundle(Bundle):
4094
shutil.rmtree(bundle_dir, ignore_errors=True)
4096
+ def get_bundle_id(self):
4099
def _read_metadata(self, bundle_dir):
4100
metadata_path = os.path.join(bundle_dir, '_metadata.json')
4101
if not os.path.exists(metadata_path):
4102
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
4103
index b6d2bde..19d437b 100644
4104
--- a/src/jarabe/journal/model.py
4105
+++ b/src/jarabe/journal/model.py
4106
@@ -153,7 +153,13 @@ class BaseResultSet(object):
4107
query = self._query.copy()
4108
query['limit'] = self._cache_limit
4109
query['offset'] = offset
4110
- entries, self._total_count = self.find(query)
4111
+ entries, total_count = self.find(query)
4113
+ if total_count != self._total_count:
4114
+ logging.warning('Inconsistency detected, remaking the cache')
4116
+ self._cache.remove_all(self._cache)
4117
+ return self.read(max_count)
4119
self._cache.remove_all(self._cache)
4120
self._cache.append_all(entries)
4121
@@ -168,7 +174,13 @@ class BaseResultSet(object):
4122
query = self._query.copy()
4123
query['limit'] = max_count
4124
query['offset'] = last_cached_entry
4125
- entries, self._total_count = self.find(query)
4126
+ entries, total_count = self.find(query)
4128
+ if total_count != self._total_count:
4129
+ logging.warning('Inconsistency detected, remaking the cache')
4131
+ self._cache.remove_all(self._cache)
4132
+ return self.read(max_count)
4135
self._cache.append_all(entries)
4136
@@ -190,7 +202,13 @@ class BaseResultSet(object):
4137
query = self._query.copy()
4138
query['limit'] = limit
4139
query['offset'] = self._offset
4140
- entries, self._total_count = self.find(query)
4141
+ entries, total_count = self.find(query)
4143
+ if total_count != self._total_count:
4144
+ logging.warning('Inconsistency detected, remaking the cache')
4146
+ self._cache.remove_all(self._cache)
4147
+ return self.read(max_count)
4150
self._cache.prepend_all(entries)
4151
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
4152
index 42d39b0..a3dc3ea 100644
4153
--- a/src/jarabe/model/bundleregistry.py
4154
+++ b/src/jarabe/model/bundleregistry.py
4155
@@ -26,6 +26,7 @@ import cjson
4157
from sugar.bundle.activitybundle import ActivityBundle
4158
from sugar.bundle.contentbundle import ContentBundle
4159
+from jarabe.journal.journalentrybundle import JournalEntryBundle
4160
from sugar.bundle.bundle import MalformedBundleException, \
4161
AlreadyInstalledException, RegistrationException
4162
from sugar import env
4163
@@ -306,10 +307,19 @@ class BundleRegistry(gobject.GObject):
4164
'favorites': self._favorite_bundles}
4165
open(path, 'w').write(cjson.encode(favorites_data))
4167
+ def is_pre_installed(self, bundle_id):
4168
+ installed = self.get_bundle(bundle_id)
4169
+ if installed is not None and \
4170
+ not installed.get_path().startswith(
4171
+ env.get_user_activities_path()):
4175
def is_installed(self, bundle):
4176
# TODO treat ContentBundle in special way
4177
# needs rethinking while fixing ContentBundle support
4178
- if isinstance(bundle, ContentBundle):
4179
+ if isinstance(bundle, ContentBundle) or \
4180
+ isinstance(bundle, JournalEntryBundle):
4181
return bundle.is_installed()
4183
for installed_bundle in self._bundles:
4184
@@ -322,7 +332,8 @@ class BundleRegistry(gobject.GObject):
4185
def install(self, bundle):
4186
activities_path = env.get_user_activities_path()
4188
- if self.get_bundle(bundle.get_bundle_id()):
4189
+ if self.is_pre_installed(bundle.get_bundle_id()) or \
4190
+ self.is_installed(bundle):
4191
raise AlreadyInstalledException
4193
for installed_bundle in self._bundles:
4194
@@ -338,7 +349,8 @@ class BundleRegistry(gobject.GObject):
4196
# TODO treat ContentBundle in special way
4197
# needs rethinking while fixing ContentBundle support
4198
- if isinstance(bundle, ContentBundle):
4199
+ if isinstance(bundle, ContentBundle) or \
4200
+ isinstance(bundle, JournalEntryBundle):
4202
elif not self.add_bundle(install_path):
4203
raise RegistrationException
4204
@@ -346,7 +358,8 @@ class BundleRegistry(gobject.GObject):
4205
def uninstall(self, bundle, force=False):
4206
# TODO treat ContentBundle in special way
4207
# needs rethinking while fixing ContentBundle support
4208
- if isinstance(bundle, ContentBundle):
4209
+ if isinstance(bundle, ContentBundle) or \
4210
+ isinstance(bundle, JournalEntryBundle):
4211
if bundle.is_installed():