From 8ef170989d70326c09c6630f5b37108d5636831c Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Wed, 04 Sep 2013 19:41:57 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
(limited to 'po/pa.po')

diff --git a/po/pa.po b/po/pa.po
index 774b136..ee45c5c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-29 00:32-0400\n"
+"POT-Creation-Date: 2013-06-28 00:32-0400\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"
@@ -35,56 +35,66 @@ msgid ""
 "online courses, find books, connect with friends and more."
 msgstr ""
 
-#: browser.py:395 browser.py:444 browser.py:445 webactivity.py:398
+#: browser.py:472 browser.py:524 browser.py:525 webactivity.py:451
 msgid "Untitled"
 msgstr ""
 
-#: browser.py:441
+#: browser.py:521
 msgid "Loading..."
 msgstr ""
 
-#: browser.py:647 browser.py:648
+#: browser.py:757 browser.py:758
 msgid "This web page could not be loaded"
 msgstr ""
 
-#: browser.py:649
+#: browser.py:759
 #, python-format
 msgid ""
 "\"%s\" could not be loaded. Please check for typing errors, and make sure "
-"you are connected to the internet."
+"you are connected to the Internet."
 msgstr ""
 
-#: browser.py:652
+#: browser.py:762 pdfviewer.py:394
 msgid "Try again"
 msgstr ""
 
-#: downloadmanager.py:102
+#: downloadmanager.py:124
+msgid "Not enough space to download"
+msgstr ""
+
+#: downloadmanager.py:133
+msgid ""
+"Download \"%{filename}\" requires %{total_size_in_mb} MB of free space, only "
+"%{free_space_in_mb} MB is available"
+msgstr ""
+
+#: downloadmanager.py:141 downloadmanager.py:176
+msgid "Ok"
+msgstr ""
+
+#: downloadmanager.py:157
 msgid "Download started"
 msgstr ""
 
-#: downloadmanager.py:103 downloadmanager.py:114
+#: downloadmanager.py:158 downloadmanager.py:170
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: downloadmanager.py:112
+#: downloadmanager.py:168
 msgid "Download completed"
 msgstr ""
 
-#: downloadmanager.py:117
+#: downloadmanager.py:173
 msgid "Show in Journal"
 msgstr ""
 
-#: downloadmanager.py:120
-msgid "Ok"
-msgstr ""
-
-#: downloadmanager.py:128 pdfviewer.py:419
+#: downloadmanager.py:184 pdfviewer.py:589
 #, python-format
 msgid "From: %s"
 msgstr ""
 
-#: downloadmanager.py:203
+#: downloadmanager.py:292
 #, python-format
 msgid ""
 "Downloading %(filename)s from \n"
@@ -103,104 +113,140 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: palettes.py:130
-msgid "Copy text"
-msgstr ""
-
-#: palettes.py:165
+#: palettes.py:184
 msgid "Follow link"
 msgstr ""
 
-#: palettes.py:170
+#: palettes.py:189
 msgid "Follow link in new tab"
 msgstr ""
 
-#: palettes.py:176
+#: palettes.py:198
 msgid "Keep link"
 msgstr ""
 
-#: palettes.py:182
+#: palettes.py:204
 msgid "Copy link"
 msgstr ""
 
-#: palettes.py:232
+#: palettes.py:218
 msgid "Copy image"
 msgstr ""
 
-#: palettes.py:238
+#: palettes.py:224
 msgid "Keep image"
 msgstr ""
 
-#: pdfviewer.py:87 viewtoolbar.py:39
+#: palettes.py:238
+msgid "Copy text"
+msgstr ""
+
+#: pdfviewer.py:91 viewtoolbar.py:39
 msgid "Zoom out"
 msgstr ""
 
-#: pdfviewer.py:93 viewtoolbar.py:45
+#: pdfviewer.py:97 viewtoolbar.py:45
 msgid "Zoom in"
 msgstr ""
 
-#: pdfviewer.py:104
+#: pdfviewer.py:103 viewtoolbar.py:51
+msgid "Actual size"
+msgstr ""
+
+#: pdfviewer.py:114
 msgid "Previous page"
 msgstr ""
 
-#: pdfviewer.py:111
+#: pdfviewer.py:121
 msgid "Next page"
 msgstr ""
 
-#: pdfviewer.py:123
+#: pdfviewer.py:133
 msgid "Save PDF to Journal"
 msgstr ""
 
-#: viewtoolbar.py:51
-msgid "Actual size"
+#: pdfviewer.py:341
+msgid "Cancel"
+msgstr ""
+
+#: pdfviewer.py:490
+msgid "Downloading document..."
+msgstr ""
+
+#: pdfviewer.py:546
+msgid "This document could not be loaded"
+msgstr ""
+
+#: pdfviewer.py:554
+msgid "Please make sure you are connected to the Internet."
 msgstr ""
 
 #: viewtoolbar.py:62
 msgid "Fullscreen"
 msgstr ""
 
-#: viewtoolbar.py:112
+#: viewtoolbar.py:113
 msgid "Show Tray"
 msgstr ""
 
-#: viewtoolbar.py:115
+#: viewtoolbar.py:116
 msgid "Hide Tray"
 msgstr ""
 
-#: webactivity.py:598
+#: webactivity.py:490
+msgid "The initial page was configured"
+msgstr ""
+
+#: webactivity.py:494
+msgid "The default initial page was configured"
+msgstr ""
+
+#: webactivity.py:655
 msgid "Download in progress"
 msgid_plural "Downloads in progress"
 msgstr[0] ""
 msgstr[1] ""
 
-#: webactivity.py:601
+#: webactivity.py:658
 msgid "Stopping now will erase your download"
 msgid_plural "Stopping now will erase your downloads"
 msgstr[0] ""
 msgstr[1] ""
 
-#: webactivity.py:606
+#: webactivity.py:663
 msgid "Continue download"
 msgid_plural "Continue downloads"
 msgstr[0] ""
 msgstr[1] ""
 
-#: webactivity.py:611
+#: webactivity.py:668
 msgid "Stop"
 msgstr ""
 
-#: webtoolbar.py:230
+#: webtoolbar.py:288
 msgid "Home page"
 msgstr ""
 
-#: webtoolbar.py:252
+#: webtoolbar.py:294
+msgid "Select as initial page"
+msgstr ""
+
+#: webtoolbar.py:299
+msgid "Reset initial page"
+msgstr ""
+
+#: webtoolbar.py:305
+msgid "Library"
+msgstr ""
+
+#: webtoolbar.py:338
 msgid "Back"
 msgstr ""
 
-#: webtoolbar.py:266
+#: webtoolbar.py:352
 msgid "Forward"
 msgstr ""
 
-#: webtoolbar.py:280
+#: webtoolbar.py:366
 msgid "Bookmark"
 msgstr ""
--
cgit v0.9.1