From 9e7b77cf3765156d90214720b6629e70da0382f5 Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Tue, 30 Aug 2011 17:47:34 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:write/mainline

---
diff --git a/po/ar.po b/po/ar.po
index b538eb7..fceabff 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,69 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # translation of write.master.po to Arabic
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Khaled Hosny <khaledhosny@eglug.org>, 2007.
+# Khaled Hosny <khaledhosny@eglug.org>, 2007, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: write.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 00:30-0500\n"
-"PO-Revision-Date: 2008-03-11 12:11-0400\n"
+"POT-Creation-Date: 2011-08-05 11:13-0300\n"
+"PO-Revision-Date: 2011-08-24 08:22+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
-"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Virtaal 0.7.0\n"
 
 #: activity/activity.info:2
 msgid "Write"
 msgstr "اكتب"
 
-#: AbiWordActivity.py:82
-msgid "Edit"
-msgstr "تحرير"
-
-#: AbiWordActivity.py:88
-msgid "View"
-msgstr "عرض"
-
-#: AbiWordActivity.py:97
-msgid "Text"
-msgstr "نص"
-
-#: AbiWordActivity.py:103
-msgid "Paragraph"
-msgstr ""
-
-#: AbiWordActivity.py:109 toolbar.py:549
-msgid "Bullet List"
-msgstr "قائمة منقوطة"
-
-#: AbiWordActivity.py:115 toolbar.py:217
-msgid "Table"
-msgstr "جدول"
-
-#: AbiWordActivity.py:122
-msgid "Bold"
-msgstr "عريض"
-
-#: AbiWordActivity.py:130
-msgid "Italic"
-msgstr "مائل"
-
-#: AbiWordActivity.py:138
-msgid "Underline"
-msgstr "مُسطَّر"
-
 #: toolbar.py:94
 msgid "Search"
-msgstr ""
+msgstr "ابحث"
 
 #: toolbar.py:111
 msgid "Find previous"
@@ -73,6 +37,10 @@ msgstr "ابحث عن السابق"
 msgid "Find next"
 msgstr "ابحث عن التالي"
 
+#: toolbar.py:217 AbiWordActivity.py:115
+msgid "Table"
+msgstr "جدول"
+
 #: toolbar.py:217
 msgid "Cancel"
 msgstr "الغِ"
@@ -99,7 +67,7 @@ msgstr "أدرج صورة"
 
 #: toolbar.py:263
 msgid "Floating"
-msgstr ""
+msgstr "عائم"
 
 #: toolbar.py:320
 msgid "Zoom Out"
@@ -147,19 +115,23 @@ msgstr "نص صِرف"
 
 #: toolbar.py:509
 msgid "Left justify"
-msgstr ""
+msgstr "حاذِ على اليسار"
 
 #: toolbar.py:512
 msgid "Center justify"
-msgstr ""
+msgstr "وسّط"
 
 #: toolbar.py:515
 msgid "Right justify"
-msgstr ""
+msgstr "حاذِ على اليمين"
 
 #: toolbar.py:518
 msgid "Fill justify"
-msgstr ""
+msgstr "ساوِ على الجانبين"
+
+#: toolbar.py:549 AbiWordActivity.py:109
+msgid "Bullet List"
+msgstr "قائمة منقوطة"
 
 #: toolbar.py:553
 msgid "Dashed List"
@@ -177,6 +149,34 @@ msgstr "قائمة حروف صغيرة"
 msgid "Upper Case List"
 msgstr "قائمة حروف كبيرة"
 
+#: AbiWordActivity.py:82
+msgid "Edit"
+msgstr "تحرير"
+
+#: AbiWordActivity.py:88
+msgid "View"
+msgstr "عرض"
+
+#: AbiWordActivity.py:97
+msgid "Text"
+msgstr "نص"
+
+#: AbiWordActivity.py:103
+msgid "Paragraph"
+msgstr "فقرة"
+
+#: AbiWordActivity.py:122
+msgid "Bold"
+msgstr "عريض"
+
+#: AbiWordActivity.py:130
+msgid "Italic"
+msgstr "مائل"
+
+#: AbiWordActivity.py:138
+msgid "Underline"
+msgstr "مُسطَّر"
+
 #: widgets.py:165
 msgid "Rich Text (RTF)"
 msgstr "نص غني (RTF)"
@@ -203,15 +203,15 @@ msgstr "TXT"
 
 #: widgets.py:181
 msgid "Portable Document Format (PDF)"
-msgstr ""
+msgstr "صيغة المستندات المحمولة (PDF)"
 
 #: widgets.py:182
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #: widgets.py:187 widgets.py:188
 msgid "Export"
-msgstr ""
+msgstr "صدّر"
 
 #~ msgid "Image"
 #~ msgstr "صورة"
diff --git a/po/da.po b/po/da.po
index 7eb2640..aeb07b2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,11 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 00:30-0500\n"
+"POT-Creation-Date: 2011-08-05 11:13-0300\n"
 "PO-Revision-Date: 2011-04-05 16:06+0200\n"
 "Last-Translator: Aputsiaq <aj@isit.gl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: da\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,42 +29,6 @@ msgstr ""
 msgid "Write"
 msgstr "Skriv"
 
-#: AbiWordActivity.py:82
-msgid "Edit"
-msgstr "Redigér"
-
-#: AbiWordActivity.py:88
-msgid "View"
-msgstr "Vis"
-
-#: AbiWordActivity.py:97
-msgid "Text"
-msgstr "Tekst"
-
-#: AbiWordActivity.py:103
-msgid "Paragraph"
-msgstr "Paragraf"
-
-#: AbiWordActivity.py:109 toolbar.py:549
-msgid "Bullet List"
-msgstr "Punktopstilling"
-
-#: AbiWordActivity.py:115 toolbar.py:217
-msgid "Table"
-msgstr "Tabel"
-
-#: AbiWordActivity.py:122
-msgid "Bold"
-msgstr "Fed"
-
-#: AbiWordActivity.py:130
-msgid "Italic"
-msgstr "Kursiv"
-
-#: AbiWordActivity.py:138
-msgid "Underline"
-msgstr "Understreget"
-
 #: toolbar.py:94
 msgid "Search"
 msgstr "Søg"
@@ -77,6 +41,10 @@ msgstr "Find forrige"
 msgid "Find next"
 msgstr "Find næste"
 
+#: toolbar.py:217 AbiWordActivity.py:115
+msgid "Table"
+msgstr "Tabel"
+
 #: toolbar.py:217
 msgid "Cancel"
 msgstr "Fortryd"
@@ -165,6 +133,10 @@ msgstr "Justér højre"
 msgid "Fill justify"
 msgstr "Lige marginer"
 
+#: toolbar.py:549 AbiWordActivity.py:109
+msgid "Bullet List"
+msgstr "Punktopstilling"
+
 #: toolbar.py:553
 msgid "Dashed List"
 msgstr "Stregliste"
@@ -181,6 +153,34 @@ msgstr "Liste med små bogstaver"
 msgid "Upper Case List"
 msgstr "Liste med store bogstaver"
 
+#: AbiWordActivity.py:82
+msgid "Edit"
+msgstr "Redigér"
+
+#: AbiWordActivity.py:88
+msgid "View"
+msgstr "Vis"
+
+#: AbiWordActivity.py:97
+msgid "Text"
+msgstr "Tekst"
+
+#: AbiWordActivity.py:103
+msgid "Paragraph"
+msgstr "Paragraf"
+
+#: AbiWordActivity.py:122
+msgid "Bold"
+msgstr "Fed"
+
+#: AbiWordActivity.py:130
+msgid "Italic"
+msgstr "Kursiv"
+
+#: AbiWordActivity.py:138
+msgid "Underline"
+msgstr "Understreget"
+
 #: widgets.py:165
 msgid "Rich Text (RTF)"
 msgstr "Rich Text (RTF)"
diff --git a/po/en.po b/po/en.po
index c70cbdc..607709d 100644
--- a/po/en.po
+++ b/po/en.po
@@ -14,11 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 00:30-0500\n"
+"POT-Creation-Date: 2011-08-05 11:13-0300\n"
 "PO-Revision-Date: 2011-02-09 18:31+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,42 +29,6 @@ msgstr ""
 msgid "Write"
 msgstr "Write"
 
-#: AbiWordActivity.py:82
-msgid "Edit"
-msgstr "Edit"
-
-#: AbiWordActivity.py:88
-msgid "View"
-msgstr "View"
-
-#: AbiWordActivity.py:97
-msgid "Text"
-msgstr "Text"
-
-#: AbiWordActivity.py:103
-msgid "Paragraph"
-msgstr "Paragraph"
-
-#: AbiWordActivity.py:109 toolbar.py:549
-msgid "Bullet List"
-msgstr "Bullet List"
-
-#: AbiWordActivity.py:115 toolbar.py:217
-msgid "Table"
-msgstr "Table"
-
-#: AbiWordActivity.py:122
-msgid "Bold"
-msgstr "Bold"
-
-#: AbiWordActivity.py:130
-msgid "Italic"
-msgstr "Italic"
-
-#: AbiWordActivity.py:138
-msgid "Underline"
-msgstr "Underline"
-
 #: toolbar.py:94
 msgid "Search"
 msgstr "Search"
@@ -77,6 +41,10 @@ msgstr "Find previous"
 msgid "Find next"
 msgstr "Find next"
 
+#: toolbar.py:217 AbiWordActivity.py:115
+msgid "Table"
+msgstr "Table"
+
 #: toolbar.py:217
 msgid "Cancel"
 msgstr "Cancel"
@@ -165,6 +133,10 @@ msgstr "Right justify"
 msgid "Fill justify"
 msgstr "Fill justify"
 
+#: toolbar.py:549 AbiWordActivity.py:109
+msgid "Bullet List"
+msgstr "Bullet List"
+
 #: toolbar.py:553
 msgid "Dashed List"
 msgstr "Dashed List"
@@ -181,6 +153,34 @@ msgstr "Lower Case List"
 msgid "Upper Case List"
 msgstr "Upper Case List"
 
+#: AbiWordActivity.py:82
+msgid "Edit"
+msgstr "Edit"
+
+#: AbiWordActivity.py:88
+msgid "View"
+msgstr "View"
+
+#: AbiWordActivity.py:97
+msgid "Text"
+msgstr "Text"
+
+#: AbiWordActivity.py:103
+msgid "Paragraph"
+msgstr "Paragraph"
+
+#: AbiWordActivity.py:122
+msgid "Bold"
+msgstr "Bold"
+
+#: AbiWordActivity.py:130
+msgid "Italic"
+msgstr "Italic"
+
+#: AbiWordActivity.py:138
+msgid "Underline"
+msgstr "Underline"
+
 #: widgets.py:165
 msgid "Rich Text (RTF)"
 msgstr "Rich Text (RTF)"
diff --git a/po/en_US.po b/po/en_US.po
index 3e04ccf..b0ef26b 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,11 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 00:30-0500\n"
+"POT-Creation-Date: 2011-08-05 11:13-0300\n"
 "PO-Revision-Date: 2011-02-09 18:45+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_US\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,42 +29,6 @@ msgstr ""
 msgid "Write"
 msgstr "Write"
 
-#: AbiWordActivity.py:82
-msgid "Edit"
-msgstr "Edit"
-
-#: AbiWordActivity.py:88
-msgid "View"
-msgstr "View"
-
-#: AbiWordActivity.py:97
-msgid "Text"
-msgstr "Text"
-
-#: AbiWordActivity.py:103
-msgid "Paragraph"
-msgstr "Paragraph"
-
-#: AbiWordActivity.py:109 toolbar.py:549
-msgid "Bullet List"
-msgstr "Bullet List"
-
-#: AbiWordActivity.py:115 toolbar.py:217
-msgid "Table"
-msgstr "Table"
-
-#: AbiWordActivity.py:122
-msgid "Bold"
-msgstr "Bold"
-
-#: AbiWordActivity.py:130
-msgid "Italic"
-msgstr "Italic"
-
-#: AbiWordActivity.py:138
-msgid "Underline"
-msgstr "Underline"
-
 #: toolbar.py:94
 msgid "Search"
 msgstr "Search"
@@ -77,6 +41,10 @@ msgstr "Find previous"
 msgid "Find next"
 msgstr "Find next"
 
+#: toolbar.py:217 AbiWordActivity.py:115
+msgid "Table"
+msgstr "Table"
+
 #: toolbar.py:217
 msgid "Cancel"
 msgstr "Cancel"
@@ -165,6 +133,10 @@ msgstr "Right justify"
 msgid "Fill justify"
 msgstr "Fill justify"
 
+#: toolbar.py:549 AbiWordActivity.py:109
+msgid "Bullet List"
+msgstr "Bullet List"
+
 #: toolbar.py:553
 msgid "Dashed List"
 msgstr "Dashed List"
@@ -181,6 +153,34 @@ msgstr "Lower Case List"
 msgid "Upper Case List"
 msgstr "Upper Case List"
 
+#: AbiWordActivity.py:82
+msgid "Edit"
+msgstr "Edit"
+
+#: AbiWordActivity.py:88
+msgid "View"
+msgstr "View"
+
+#: AbiWordActivity.py:97
+msgid "Text"
+msgstr "Text"
+
+#: AbiWordActivity.py:103
+msgid "Paragraph"
+msgstr "Paragraph"
+
+#: AbiWordActivity.py:122
+msgid "Bold"
+msgstr "Bold"
+
+#: AbiWordActivity.py:130
+msgid "Italic"
+msgstr "Italic"
+
+#: AbiWordActivity.py:138
+msgid "Underline"
+msgstr "Underline"
+
 #: widgets.py:165
 msgid "Rich Text (RTF)"
 msgstr "Rich Text (RTF)"
diff --git a/po/fr.po b/po/fr.po
index ce7fcbe..08a7013 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,11 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: projects/write\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 00:30-0500\n"
+"POT-Creation-Date: 2011-08-05 11:13-0300\n"
 "PO-Revision-Date: 2011-02-17 08:33+0200\n"
 "Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,42 +29,6 @@ msgstr ""
 msgid "Write"
 msgstr "Écrire"
 
-#: AbiWordActivity.py:82
-msgid "Edit"
-msgstr "Modifier"
-
-#: AbiWordActivity.py:88
-msgid "View"
-msgstr "Vue"
-
-#: AbiWordActivity.py:97
-msgid "Text"
-msgstr "Texte"
-
-#: AbiWordActivity.py:103
-msgid "Paragraph"
-msgstr "Paragraphe"
-
-#: AbiWordActivity.py:109 toolbar.py:549
-msgid "Bullet List"
-msgstr "Liste à puces"
-
-#: AbiWordActivity.py:115 toolbar.py:217
-msgid "Table"
-msgstr "Tableau"
-
-#: AbiWordActivity.py:122
-msgid "Bold"
-msgstr "Gras"
-
-#: AbiWordActivity.py:130
-msgid "Italic"
-msgstr "Italique"
-
-#: AbiWordActivity.py:138
-msgid "Underline"
-msgstr "Souligné"
-
 #: toolbar.py:94
 msgid "Search"
 msgstr "Rechercher"
@@ -77,6 +41,10 @@ msgstr "Rechercher précédent"
 msgid "Find next"
 msgstr "Rechercher suivant"
 
+#: toolbar.py:217 AbiWordActivity.py:115
+msgid "Table"
+msgstr "Tableau"
+
 #: toolbar.py:217
 msgid "Cancel"
 msgstr "Annuler"
@@ -165,6 +133,10 @@ msgstr "Aligné à droite"
 msgid "Fill justify"
 msgstr "Justifié"
 
+#: toolbar.py:549 AbiWordActivity.py:109
+msgid "Bullet List"
+msgstr "Liste à puces"
+
 #: toolbar.py:553
 msgid "Dashed List"
 msgstr "Liste à tirets"
@@ -181,6 +153,34 @@ msgstr "Liste a, b, c"
 msgid "Upper Case List"
 msgstr "Liste A, B, C"
 
+#: AbiWordActivity.py:82
+msgid "Edit"
+msgstr "Modifier"
+
+#: AbiWordActivity.py:88
+msgid "View"
+msgstr "Vue"
+
+#: AbiWordActivity.py:97
+msgid "Text"
+msgstr "Texte"
+
+#: AbiWordActivity.py:103
+msgid "Paragraph"
+msgstr "Paragraphe"
+
+#: AbiWordActivity.py:122
+msgid "Bold"
+msgstr "Gras"
+
+#: AbiWordActivity.py:130
+msgid "Italic"
+msgstr "Italique"
+
+#: AbiWordActivity.py:138
+msgid "Underline"
+msgstr "Souligné"
+
 #: widgets.py:165
 msgid "Rich Text (RTF)"
 msgstr "Texte enrichi (RTF)"
--
cgit v0.9.1