From 675265c8d357010a72ee79f0138619f47a623920 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Mon, 07 Jan 2013 20:04:14 +0000
Subject: Merge commit 'refs/merge-requests/4' of git://git.sugarlabs.org/browse/mainline into integ

---
(limited to 'po')

diff --git a/po/Browse.pot b/po/Browse.pot
index 82bbcda..ff01427 100644
--- a/po/Browse.pot
+++ b/po/Browse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-08 11:21-0500\n"
+"POT-Creation-Date: 2012-12-11 03:05+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,139 +18,186 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: activity/activity.info:2 webactivity.py:274
+#: activity/activity.info:2
 msgid "Browse"
 msgstr ""
 
-#: linkbutton.py:95
-msgid "Remove"
+#: palettes.py:167
+msgid "Copy text"
 msgstr ""
 
-#: webactivity.py:271
-msgid "Edit"
+#: palettes.py:200
+msgid "Follow link"
 msgstr ""
 
-#: webactivity.py:277
-msgid "View"
+#: palettes.py:205
+msgid "Follow link in new tab"
 msgstr ""
 
-#: webactivity.py:655
-msgid "Download in progress"
-msgid_plural "Downloads in progress"
-msgstr[0] ""
-msgstr[1] ""
+#: palettes.py:211
+msgid "Keep link"
+msgstr ""
 
-#: webactivity.py:658
-msgid "Stopping now will erase your download"
-msgid_plural "Stopping now will erase your downloads"
-msgstr[0] ""
-msgstr[1] ""
+#: palettes.py:217
+msgid "Copy link"
+msgstr ""
 
-#: webactivity.py:663
-msgid "Continue download"
-msgid_plural "Continue downloads"
-msgstr[0] ""
-msgstr[1] ""
+#: palettes.py:261
+msgid "Copy image"
+msgstr ""
 
-#: webactivity.py:667 webtoolbar.py:450
-msgid "Stop"
+#: palettes.py:267
+msgid "Keep image"
 msgstr ""
 
-#: webtoolbar.py:259
-msgid "Home page"
+#: browser.py:450 browser.py:502 browser.py:503 webactivity.py:440
+msgid "Untitled"
 msgstr ""
 
-#: webtoolbar.py:281
-msgid "Back"
+#: browser.py:499
+msgid "Loading..."
 msgstr ""
 
-#: webtoolbar.py:288
-msgid "Forward"
+#: browser.py:721 browser.py:722
+msgid "This web page could not be loaded"
 msgstr ""
 
-#: webtoolbar.py:296
-msgid "Add a tab"
+#: browser.py:723
+#, python-format
+msgid ""
+"\"%s\" could not be loaded. Please check for typing errors, and make sure "
+"you are connected to the internet."
 msgstr ""
 
-#: webtoolbar.py:303
-msgid "Bookmark"
+#: browser.py:726
+msgid "Try again"
 msgstr ""
 
-#: webtoolbar.py:453
-msgid "Reload"
+#: viewtoolbar.py:39 pdfviewer.py:87
+msgid "Zoom out"
 msgstr ""
 
-#: palettes.py:143
-msgid "Keep link"
+#: viewtoolbar.py:45 pdfviewer.py:93
+msgid "Zoom in"
 msgstr ""
 
-#: palettes.py:151
-msgid "Copy link"
+#: viewtoolbar.py:51
+msgid "Actual size"
 msgstr ""
 
-#: palettes.py:159
-msgid "Follow link"
+#: viewtoolbar.py:62
+msgid "Fullscreen"
 msgstr ""
 
-#: palettes.py:209
-msgid "Keep image"
+#: viewtoolbar.py:112
+msgid "Show Tray"
 msgstr ""
 
-#: palettes.py:217
-msgid "Copy image"
+#: viewtoolbar.py:115
+msgid "Hide Tray"
 msgstr ""
 
-#: edittoolbar.py:92
+#: edittoolbar.py:65
 msgid "Previous"
 msgstr ""
 
-#: edittoolbar.py:99
+#: edittoolbar.py:72
 msgid "Next"
 msgstr ""
 
-#: viewtoolbar.py:34
-msgid "Zoom out"
-msgstr ""
-
-#: viewtoolbar.py:40
-msgid "Zoom in"
+#: downloadmanager.py:113
+msgid "Not enough space to download"
 msgstr ""
 
-#: viewtoolbar.py:51
-msgid "Fullscreen"
+#: downloadmanager.py:122
+msgid ""
+"Download \"%{filename}\" requires %{total_size_in_mb} MB of free space, only "
+"%{free_space_in_mb} MB is available"
 msgstr ""
 
-#: viewtoolbar.py:89
-msgid "Show Tray"
+#: downloadmanager.py:130 downloadmanager.py:161
+msgid "Ok"
 msgstr ""
 
-#: viewtoolbar.py:93
-msgid "Hide Tray"
+#: downloadmanager.py:142
+msgid "Download started"
 msgstr ""
 
-#: downloadmanager.py:175
-msgid "Download started"
+#: downloadmanager.py:143 downloadmanager.py:155
+#, python-format
+msgid "%s"
 msgstr ""
 
-#: downloadmanager.py:190
+#: downloadmanager.py:153
 msgid "Download completed"
 msgstr ""
 
-#: downloadmanager.py:194
+#: downloadmanager.py:158
 msgid "Show in Journal"
 msgstr ""
 
-#: downloadmanager.py:197
-msgid "Ok"
-msgstr ""
-
-#: downloadmanager.py:204
+#: downloadmanager.py:169 pdfviewer.py:421
 #, python-format
 msgid "From: %s"
 msgstr ""
 
-#: downloadmanager.py:346
+#: downloadmanager.py:264
+#, python-format
 msgid ""
-"Downloading %2$s from \n"
-"%1$s."
+"Downloading %(filename)s from \n"
+"%(source)s."
+msgstr ""
+
+#: webactivity.py:621
+msgid "Download in progress"
+msgid_plural "Downloads in progress"
+msgstr[0] ""
+msgstr[1] ""
+
+#: webactivity.py:624
+msgid "Stopping now will erase your download"
+msgid_plural "Stopping now will erase your downloads"
+msgstr[0] ""
+msgstr[1] ""
+
+#: webactivity.py:629
+msgid "Continue download"
+msgid_plural "Continue downloads"
+msgstr[0] ""
+msgstr[1] ""
+
+#: webactivity.py:634
+msgid "Stop"
+msgstr ""
+
+#: webtoolbar.py:274
+msgid "Home page"
+msgstr ""
+
+#: webtoolbar.py:297
+msgid "Back"
+msgstr ""
+
+#: webtoolbar.py:311
+msgid "Forward"
+msgstr ""
+
+#: webtoolbar.py:325
+msgid "Bookmark"
+msgstr ""
+
+#: linkbutton.py:108
+msgid "Remove"
+msgstr ""
+
+#: pdfviewer.py:104
+msgid "Previous page"
+msgstr ""
+
+#: pdfviewer.py:111
+msgid "Next page"
+msgstr ""
+
+#: pdfviewer.py:123
+msgid "Save PDF to Journal"
 msgstr ""
--
cgit v0.9.1