From a4cdf9c5440eeee3436cafc59ccd30371bad5849 Mon Sep 17 00:00:00 2001
From: Kushal Das <kushal@fedoraproject.org>
Date: Fri, 07 May 2010 17:46:28 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:jukebox/mainline

---
diff --git a/po/de.po b/po/de.po
index e6c3211..875b4c9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,6 +2,14 @@
 # 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.
+# 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.
+# 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/po/hi.po b/po/hi.po
index 8d70a0b..ac62697 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-04 00:09+0530\n"
+"POT-Creation-Date: 2009-04-29 17:36-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"
@@ -18,24 +18,20 @@ msgstr ""
 
 #: activity/activity.info:2
 msgid "Jukebox"
-msgstr ""
-
-#: ViewToolbar.py:45
-msgid "Fit to window"
-msgstr ""
-
-#: ViewToolbar.py:51
-msgid "Original size"
-msgstr ""
+msgstr "ज्यूकबॉक्स"
 
-#: ViewToolbar.py:63 ControlToolbar.py:104
+#: ControlToolbar.py:109
 msgid "Fullscreen"
-msgstr ""
+msgstr "पूर्ण स्क्रीन"
 
-#: jukeboxactivity.py:53
+#: jukeboxactivity.py:57
 msgid "Jukebox Activity"
-msgstr ""
+msgstr "ज्यूकबॉक्स क्रिया"
 
-#: jukeboxactivity.py:60
+#: jukeboxactivity.py:64
 msgid "Play"
-msgstr ""
+msgstr "बजाएँ"
+
+#: jukeboxactivity.py:246
+msgid "Choose document"
+msgstr "दस्तावेज़ चुनें"
--
cgit v0.9.1