From d2ecf45efb44dedf4e5fb002297afe5495a29b8d Mon Sep 17 00:00:00 2001
From: erich koslovsky <erikos@localhost.localdomain>
Date: Mon, 20 Aug 2007 14:17:05 +0000
Subject: Merge branch 'master' of git://dev.laptop.org/web-activity

Removed a few conflicts for the merge.

Conflicts:

	po/Web.pot
	po/ar.po
	po/de.po
	po/el.po
	po/es.po
	po/fr.po
	po/mk.po
	po/pt.po
	po/pt_BR.po
---
(limited to 'po/el.po')

diff --git a/po/el.po b/po/el.po
index fda255b..e5f08ab 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Web activity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-19 20:16+0200\n"
+"POT-Creation-Date: 2007-08-20 10:55-0400\n"
 "PO-Revision-Date: 2007-07-25 18:49+0100\n"
 "Last-Translator: Simos Xenitellis <simos.lists@googlemail.com>\n"
 "Language-Team: Greek <olpc@grnet.gr>\n"
@@ -15,6 +15,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: activity/activity.info:2 webactivity.py:64
+msgid "Browse"
+msgstr "Περιήγηση"
+
 #: downloadmanager.py:114
 #, python-format
 msgid ""
@@ -42,30 +46,6 @@ msgstr ""
 "Γίνεται λήψη του %s από \n"
 "%s."
 
-#: linktoolbar.py:52
-msgid "title: "
-msgstr ""
-
-#: linktoolbar.py:52
-msgid "url: "
-msgstr ""
-
-#: linktoolbar.py:52
-msgid "owner: "
-msgstr ""
-
-#: linktoolbar.py:62
-msgid "remove"
-msgstr ""
-
-#: webactivity.py:79
-msgid "Browse"
-msgstr "Περιήγηση"
-
-#: webactivity.py:104 webactivity.py:105
-msgid "blank"
-msgstr ""
-
 #: webtoolbar.py:41
 msgid "Back"
 msgstr "Πίσω"
--
cgit v0.9.1