Merge branch 'master' of gitorious@git.sugarlabs.org:write/mainline

2 files changed, 91 insertions, 77 deletions

diff --git a/po/Write.pot b/po/Write.pot
index b323715..90bec7e 100644
--- a/po/Write.pot
+++ b/po/Write.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 20:56+0100\n"
+"POT-Creation-Date: 2009-08-06 18:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,166 +20,180 @@ msgstr ""
 msgid "Write"
 msgstr ""
 
-#: AbiWordActivity.py:64
-msgid "Edit"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:52
+msgid "Rich Text (RTF)"
 msgstr ""
 
-#: AbiWordActivity.py:67
-msgid "Text"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:52
+msgid "RTF"
+msgstr ""
+
+#: /home/sugar/src/activities/Write.activity/toolbar.py:53
+msgid "Hypertext (HTML)"
+msgstr ""
+
+#: /home/sugar/src/activities/Write.activity/toolbar.py:53
+msgid "HTML"
+msgstr ""
+
+#: /home/sugar/src/activities/Write.activity/toolbar.py:54
+msgid "Plain Text (TXT)"
+msgstr ""
+
+#: /home/sugar/src/activities/Write.activity/toolbar.py:54
+msgid "TXT"
 msgstr ""
 
-#: AbiWordActivity.py:71
-msgid "Image"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:126
+msgid "Find previous"
+msgstr ""
+
+#: /home/sugar/src/activities/Write.activity/toolbar.py:132
+msgid "Find next"
 msgstr ""
 
-#: AbiWordActivity.py:75 toolbar.py:515
+#: /home/sugar/src/activities/Write.activity/toolbar.py:205
 msgid "Table"
 msgstr ""
 
-#: AbiWordActivity.py:79
-msgid "Format"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:205
+msgid "Cancel"
 msgstr ""
 
-#: AbiWordActivity.py:83
-msgid "View"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:213
+msgid "Insert Row"
 msgstr ""
 
-#: toolbar.py:51
-msgid "Rich Text (RTF)"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:218
+msgid "Delete Row"
 msgstr ""
 
-#: toolbar.py:51
-msgid "RTF"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:223
+msgid "Insert Column"
 msgstr ""
 
-#: toolbar.py:52
-msgid "Hypertext (HTML)"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:228
+msgid "Delete Column"
 msgstr ""
 
-#: toolbar.py:52
-msgid "HTML"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:236
+msgid "Insert Image"
 msgstr ""
 
-#: toolbar.py:53
-msgid "Plain Text (TXT)"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:280
+msgid "Zoom Out"
 msgstr ""
 
-#: toolbar.py:53
-msgid "TXT"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:286
+msgid "Zoom In"
 msgstr ""
 
-#: toolbar.py:128
-msgid "Find previous"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:302
+msgid "%"
 msgstr ""
 
-#: toolbar.py:134
-msgid "Find next"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:314
+msgid "Page: "
 msgstr ""
 
-#: toolbar.py:244
+#: /home/sugar/src/activities/Write.activity/toolbar.py:400
 msgid "Bold"
 msgstr ""
 
-#: toolbar.py:251
+#: /home/sugar/src/activities/Write.activity/toolbar.py:408
 msgid "Italic"
 msgstr ""
 
-#: toolbar.py:258
+#: /home/sugar/src/activities/Write.activity/toolbar.py:416
 msgid "Underline"
 msgstr ""
 
-#: toolbar.py:481
-msgid "Insert Image"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:456
+msgid "Left justify"
 msgstr ""
 
-#: toolbar.py:489
-msgid "Choose image"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:463
+msgid "Center justify"
 msgstr ""
 
-#: toolbar.py:515
-msgid "Cancel"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:470
+msgid "Right justify"
 msgstr ""
 
-#: toolbar.py:524
-msgid "Insert Row"
+#: /home/sugar/src/activities/Write.activity/toolbar.py:477
+msgid "Fill justify"
 msgstr ""
 
-#: toolbar.py:530
-msgid "Delete Row"
+#: /home/sugar/src/activities/Write.activity/AbiWordActivity.py:70
+msgid "Text"
 msgstr ""
 
-#: toolbar.py:536
-msgid "Insert Column"
+#: /home/sugar/src/activities/Write.activity/AbiWordActivity.py:76
+msgid "Paragraph"
 msgstr ""
 
-#: toolbar.py:542
-msgid "Delete Column"
+#: /home/sugar/src/activities/Write.activity/AbiWordActivity.py:118
+msgid "Insert"
 msgstr ""
 
-#: toolbar.py:580
-msgid "Style: "
+#: /home/sugar/src/activities/Write.activity/AbiWordActivity.py:125
+msgid "Search"
 msgstr ""
 
-#: toolbar.py:590
+#: /home/sugar/src/activities/Write.activity/AbiWordActivity.py:131
+msgid "View"
+msgstr ""
+
+#: /home/sugar/src/activities/Write.activity/widgets.py:114
 msgid "Heading 1"
 msgstr ""
 
-#: toolbar.py:591
+#: /home/sugar/src/activities/Write.activity/widgets.py:115
 msgid "Heading 2"
 msgstr ""
 
-#: toolbar.py:592
+#: /home/sugar/src/activities/Write.activity/widgets.py:116
 msgid "Heading 3"
 msgstr ""
 
-#: toolbar.py:593
+#: /home/sugar/src/activities/Write.activity/widgets.py:117
 msgid "Heading 4"
 msgstr ""
 
-#: toolbar.py:594
+#: /home/sugar/src/activities/Write.activity/widgets.py:118
+#: /home/sugar/src/activities/Write.activity/widgets.py:218
 msgid "Bullet List"
 msgstr ""
 
-#: toolbar.py:595
+#: /home/sugar/src/activities/Write.activity/widgets.py:119
+#: /home/sugar/src/activities/Write.activity/widgets.py:222
 msgid "Dashed List"
 msgstr ""
 
-#: toolbar.py:596
+#: /home/sugar/src/activities/Write.activity/widgets.py:120
+#: /home/sugar/src/activities/Write.activity/widgets.py:226
 msgid "Numbered List"
 msgstr ""
 
-#: toolbar.py:597
+#: /home/sugar/src/activities/Write.activity/widgets.py:121
+#: /home/sugar/src/activities/Write.activity/widgets.py:230
 msgid "Lower Case List"
 msgstr ""
 
-#: toolbar.py:598
+#: /home/sugar/src/activities/Write.activity/widgets.py:122
+#: /home/sugar/src/activities/Write.activity/widgets.py:234
 msgid "Upper Case List"
 msgstr ""
 
-#: toolbar.py:599
+#: /home/sugar/src/activities/Write.activity/widgets.py:123
 msgid "Block Text"
 msgstr ""
 
-#: toolbar.py:600
+#: /home/sugar/src/activities/Write.activity/widgets.py:124
+#: /home/sugar/src/activities/Write.activity/widgets.py:208
 msgid "Normal"
 msgstr ""
 
-#: toolbar.py:601
+#: /home/sugar/src/activities/Write.activity/widgets.py:125
 msgid "Plain Text"
 msgstr ""
-
-#: toolbar.py:656
-msgid "Zoom Out"
-msgstr ""
-
-#: toolbar.py:662
-msgid "Zoom In"
-msgstr ""
-
-#: toolbar.py:678
-msgid "%"
-msgstr ""
-
-#: toolbar.py:690
-msgid "Page: "
-msgstr ""
diff --git a/po/en_US.po b/po/en_US.po
index e626794..a2c6f01 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -117,7 +117,7 @@ msgstr "Delete Column"
 
 #: toolbar.py:580
 msgid "Style: "
-msgstr "Style: _"
+msgstr "Style: "
 
 #: toolbar.py:590
 msgid "Heading 1"
@@ -181,4 +181,4 @@ msgstr "%"
 
 #: toolbar.py:690
 msgid "Page: "
-msgstr "Page: _"
+msgstr "Page: "