From 1cfe5cd752879382364106b58313be3b49388458 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Wed, 17 Aug 2011 15:48:33 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
diff --git a/po/de.po b/po/de.po
index 38e45bb..119fe16 100644
--- a/po/de.po
+++ b/po/de.po
@@ -56,8 +56,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: web\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-13 00:32-0400\n"
-"PO-Revision-Date: 2011-06-14 11:05+0200\n"
+"POT-Creation-Date: 2011-08-09 00:31-0400\n"
+"PO-Revision-Date: 2011-08-14 23:36+0200\n"
 "Last-Translator: Markus <m.slg@gmx.de>\n"
 "Language-Team: German <fedora-trans-de@redhat.com>\n"
 "Language: de\n"
@@ -68,39 +68,38 @@ msgstr ""
 "X-Generator: Pootle 2.0.1\n"
 "X-Poedit-Language: German\n"
 
-#: activity/activity.info:2 webactivity.py:267
+#: activity/activity.info:2 webactivity.py:274
 msgid "Browse"
 msgstr "Browser"
 
-#: downloadmanager.py:164
+#: downloadmanager.py:175
 msgid "Download started"
 msgstr "Herunterladen gestartet"
 
-#: downloadmanager.py:179
+#: downloadmanager.py:190
 msgid "Download completed"
 msgstr "Herunterladen abgeschlossen"
 
-#: downloadmanager.py:183
+#: downloadmanager.py:194
 msgid "Show in Journal"
 msgstr "Im Tagebuch anzeigen"
 
-#: downloadmanager.py:186
+#: downloadmanager.py:197
 msgid "Ok"
 msgstr "Ok"
 
-#: downloadmanager.py:193
+#: downloadmanager.py:204
 #, python-format
 msgid "From: %s"
 msgstr "Von: %s"
 
-#: downloadmanager.py:335
-#, python-format
+#: downloadmanager.py:346
 msgid ""
-"Downloading %s from \n"
-"%s."
+"Downloading %2$s from \n"
+"%1$s."
 msgstr ""
-"%s heruntergeladen von \n"
-"%s."
+"Lade %2$s von \n"
+"%1$s herunter."
 
 #: edittoolbar.py:92
 msgid "Previous"
@@ -154,33 +153,33 @@ msgstr "Ablage anzeigen"
 msgid "Hide Tray"
 msgstr "Ablage verbergen"
 
-#: webactivity.py:264
+#: webactivity.py:271
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: webactivity.py:270
+#: webactivity.py:277
 msgid "View"
 msgstr "Ansicht"
 
-#: webactivity.py:654
+#: webactivity.py:655
 msgid "Download in progress"
 msgid_plural "Downloads in progress"
 msgstr[0] "Datei wird heruntergeladen"
 msgstr[1] "Dateien werden heruntergeladen"
 
-#: webactivity.py:657
+#: webactivity.py:658
 msgid "Stopping now will erase your download"
 msgid_plural "Stopping now will erase your downloads"
 msgstr[0] "Jetzt anhalten wird das Herunterladen einer Datei abbrechen"
 msgstr[1] "Jetzt anhalten wird das Herunterladen mehrerer Dateien abbrechen"
 
-#: webactivity.py:662
+#: webactivity.py:663
 msgid "Continue download"
 msgid_plural "Continue downloads"
 msgstr[0] "Herunterladen der Datei fortsetzen"
 msgstr[1] "Herunterladen der Dateien fortsetzen"
 
-#: webactivity.py:666 webtoolbar.py:449
+#: webactivity.py:667 webtoolbar.py:450
 msgid "Stop"
 msgstr "Anhalten"
 
@@ -204,7 +203,7 @@ msgstr "Reiter hinzufügen"
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
-#: webtoolbar.py:452
+#: webtoolbar.py:453
 msgid "Reload"
 msgstr "Neu laden"
 
--
cgit v0.9.1