From d2ecf45efb44dedf4e5fb002297afe5495a29b8d Mon Sep 17 00:00:00 2001 From: erich koslovsky 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') diff --git a/po/ar.po b/po/ar.po index 279f9e9..cf77ad1 100644 --- a/po/ar.po +++ b/po/ar.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-06-28 21:44+0300\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" @@ -18,6 +18,10 @@ msgstr "" "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : " "3\n" +#: activity/activity.info:2 webactivity.py:64 +msgid "Browse" +msgstr "تصفّح" + #: downloadmanager.py:114 #, python-format msgid "" @@ -45,30 +49,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 "للخلف" diff --git a/po/de.po b/po/de.po index 64bb18c..3b24e79 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: web\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-30 10:37+0100\n" "Last-Translator: Fabian Affolter \n" "Language-Team: German \n" @@ -15,6 +15,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" +#: activity/activity.info:2 webactivity.py:64 +msgid "Browse" +msgstr "Durchsuchen" + #: downloadmanager.py:114 #, python-format msgid "" @@ -42,30 +46,6 @@ msgstr "" "Herunterladen %s von \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 "Durchsuchen" - -#: webactivity.py:104 webactivity.py:105 -msgid "blank" -msgstr "" - #: webtoolbar.py:41 msgid "Back" msgstr "Zurück" 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 \n" "Language-Team: Greek \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 "Πίσω" diff --git a/po/es.po b/po/es.po index 2ef0588..6a32711 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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-03-23 15:04+0100\n" "Last-Translator: Tomeu Vizoso \n" "Language-Team: Spanish \n" @@ -16,6 +16,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: activity/activity.info:2 webactivity.py:64 +msgid "Browse" +msgstr "Navegar" + #: downloadmanager.py:114 #, python-format msgid "" @@ -43,30 +47,6 @@ msgstr "" "Bajando %s desde \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 "Navegar" - -#: webactivity.py:104 webactivity.py:105 -msgid "blank" -msgstr "" - #: webtoolbar.py:41 msgid "Back" msgstr "Volver" diff --git a/po/fr.po b/po/fr.po index f1a595b..deea254 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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-31 09:48+0200\n" "Last-Translator: Samuel Bizien \n" "Language-Team: Traduc-fr \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 "Naviguer" + #: downloadmanager.py:114 #, python-format msgid "" @@ -42,30 +46,6 @@ msgstr "" "Téléchargement de %s depuis \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 "Naviguer" - -#: webactivity.py:104 webactivity.py:105 -msgid "blank" -msgstr "" - #: webtoolbar.py:41 msgid "Back" msgstr "Précédent" 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 \n" "Language-Team: Macedonian \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 "Назад" diff --git a/po/pt.po b/po/pt.po index eca9217..01ea28a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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-03-23 15:04+0100\n" "Last-Translator: Tomeu Vizoso \n" "Language-Team: Portuguese \n" @@ -16,6 +16,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: activity/activity.info:2 webactivity.py:64 +msgid "Browse" +msgstr "" + #: downloadmanager.py:114 #, python-format msgid "" @@ -37,30 +41,6 @@ msgid "" "%s." msgstr "" -#: 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 "Voltar" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2e3f7e1..31fa778 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\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-03 10:43-0300\n" "Last-Translator: Diego Búrigo Zacarão \n" "Language-Team: Brazilian Portuguese \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 "Navegar" + #: downloadmanager.py:114 #, python-format msgid "" @@ -43,30 +47,6 @@ msgstr "" "Efetuando download %s a partir de\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 "Navegar" - -#: webactivity.py:104 webactivity.py:105 -msgid "blank" -msgstr "" - #: webtoolbar.py:41 msgid "Back" msgstr "Voltar" 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 , 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 \n" -"Language-Team: LANGUAGE \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