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/web-activity.pot')

diff --git a/po/web-activity.pot b/po/web-activity.pot
deleted file mode 100644
index 63b64ae..0000000
--- a/po/web-activity.pot
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-21 21:10+0200\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: downloadmanager.py:91
-#, python-format
-msgid ""
-"File %s downloaded from\n"
-"%s."
-msgstr ""
-
-#: downloadmanager.py:118
-#, python-format
-msgid ""
-"Downloading %s from\n"
-"%s. Progress %i%%."
-msgstr ""
-
-#: downloadmanager.py:129
-#, python-format
-msgid ""
-"Downloading %s from \n"
-"%s."
-msgstr ""
-
-#: webactivity.py:44
-msgid "Web Activity"
-msgstr ""
-
-#: webactivity.py:57
-msgid "Browse"
-msgstr ""
-
-#: webtoolbar.py:85
-msgid "Back"
-msgstr ""
-
-#: webtoolbar.py:92
-msgid "Forward"
-msgstr ""
-
-#: webtoolbar.py:172
-msgid "Stop"
-msgstr ""
-
-#: webtoolbar.py:175
-msgid "Reload"
-msgstr ""
--
cgit v0.9.1