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/mk.po')

diff --git a/po/mk.po b/po/mk.po
index 1feaa0f..f326d4b 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: web-activity.master\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-06 13:43+0200\n"
 "Last-Translator: Arangel Angov <arangel@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -16,6 +16,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: activity/activity.info:2 webactivity.py:64
+msgid "Browse"
+msgstr "Разгледај"
+
 #: downloadmanager.py:114
 #, python-format
 msgid ""
@@ -43,30 +47,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