From e2666c50a7ca41a49fca9ecd8aabcc99a66fe537 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Fri, 7 Apr 2006 20:22:30 +0000 Subject: [PATCH] Lots of bureaucracy changes and outsourcing of the debian build scripts. git-svn-id: svn://svn.berlios.de/gpodder@83 b0d088ad-0a06-0410-aad2-9ed5178a7e87 --- ChangeLog | 8 ++ bin/gpodder | 24 +++++- data/messages.pot | 116 +++++++++++++------------- data/po/de.po | 143 ++++++++++++++++---------------- data/po/fr.po | 116 +++++++++++++------------- debian/README.Debian | 5 -- debian/changelog | 35 -------- debian/compat | 1 - debian/control | 20 ----- debian/copyright | 12 --- debian/rules | 149 ---------------------------------- doc/dev/copyright_notice | 19 +++++ doc/dev/tepache | 3 +- doc/man/gpodder.1 | 2 +- setup.py | 21 ++++- src/gpodder/console.py | 21 +++++ src/gpodder/gpodder.py | 21 ++++- src/gpodder/gpodder.py.orig | 1 - src/gpodder/libgpodder.py | 21 ++++- src/gpodder/libipodsync.py | 21 ++++- src/gpodder/liblocaldb.py | 21 ++++- src/gpodder/liblocdbreader.py | 22 ++++- src/gpodder/liblocdbwriter.py | 21 ++++- src/gpodder/libopmlwriter.py | 21 ++++- src/gpodder/libplayers.py | 21 ++++- src/gpodder/libpodcasts.py | 21 ++++- src/gpodder/librssreader.py | 21 ++++- src/gpodder/libwget.py | 21 ++++- 28 files changed, 478 insertions(+), 450 deletions(-) delete mode 100644 debian/README.Debian delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/rules create mode 100644 doc/dev/copyright_notice diff --git a/ChangeLog b/ChangeLog index d967422e..6b143f51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri, 07 Apr 2006 22:00:06 +0200 + * Uhh! Gotta love bureaucracy (bureaucrazy?) -- anyway, got some + more GPL-related copyright notices into the source tree + * Removed "debian/" structure for now.. Currently working with + people at Ubuntu ("REVU") to get a decent Ubuntu package for + gPodder, based on the great work of Peter Hoffmann + * The debian build structure will probably be seen elsewhere soon + Fri, 07 Apr 2006 21:22:11 +0200 * Put podcasts onto the iPod in a more iTunes-like way diff --git a/bin/gpodder b/bin/gpodder index 325618cb..e5427e3a 100755 --- a/bin/gpodder +++ b/bin/gpodder @@ -1,9 +1,29 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -"""gPodder Media Aggregator""" +# +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# -# PLEASE DO NOT CHANGE FORMAT OF __version__ LINE (Makefile reads this) +"""gPodder media aggregator""" + +# PLEASE DO NOT CHANGE FORMAT OF __version__ LINE (setup.py reads this) __author__ = "Thomas Perl " __version__ = "0.7svn" diff --git a/data/messages.pot b/data/messages.pot index 6f77bf8b..ba782a5b 100644 --- a/data/messages.pot +++ b/data/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gPodder 0.7svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-07 16:05+0200\n" +"POT-Creation-Date: 2006-04-07 21:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,57 +16,57 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/gpodder/console.py:64 +#: src/gpodder/console.py:85 #, python-format msgid "delete channel: %s" msgstr "" -#: src/gpodder/console.py:67 +#: src/gpodder/console.py:88 #, python-format msgid "%s is not a valid id" msgstr "" -#: src/gpodder/gpodder.py:57 +#: src/gpodder/gpodder.py:70 msgid "Contributors / patch writers:" msgstr "" -#: src/gpodder/gpodder.py:61 +#: src/gpodder/gpodder.py:74 msgid "See the AUTHORS file for all contributors" msgstr "" -#: src/gpodder/gpodder.py:118 src/gpodder/gpodder.py:133 -#: src/gpodder/gpodder.py:139 +#: src/gpodder/gpodder.py:131 src/gpodder/gpodder.py:146 +#: src/gpodder/gpodder.py:152 msgid "Episode" msgstr "" -#: src/gpodder/gpodder.py:123 +#: src/gpodder/gpodder.py:136 msgid "Size" msgstr "" -#: src/gpodder/gpodder.py:142 +#: src/gpodder/gpodder.py:155 msgid "Speed" msgstr "" -#: src/gpodder/gpodder.py:145 +#: src/gpodder/gpodder.py:158 msgid "Progress" msgstr "" -#: src/gpodder/gpodder.py:169 +#: src/gpodder/gpodder.py:182 msgid "Channel Info" msgstr "" -#: src/gpodder/gpodder.py:186 +#: src/gpodder/gpodder.py:199 #, python-format msgid "" "gPodder development version %s\n" "Use at your own risk, but also enjoy new features :)" msgstr "" -#: src/gpodder/gpodder.py:213 +#: src/gpodder/gpodder.py:226 msgid "No downloaded podcasts found." msgstr "" -#: src/gpodder/gpodder.py:223 +#: src/gpodder/gpodder.py:236 msgid "" "No channels found\n" "\n" @@ -74,42 +74,42 @@ msgid "" "new channel." msgstr "" -#: src/gpodder/gpodder.py:225 +#: src/gpodder/gpodder.py:238 msgid "gPodder message" msgstr "" -#: src/gpodder/gpodder.py:233 +#: src/gpodder/gpodder.py:246 msgid "Do you really want to do this?" msgstr "" -#: src/gpodder/gpodder.py:233 +#: src/gpodder/gpodder.py:246 msgid "gPodder confirmation" msgstr "" -#: src/gpodder/gpodder.py:298 +#: src/gpodder/gpodder.py:311 msgid "" "There has been an error adding the channel.\n" "Maybe the URL is wrong?" msgstr "" -#: src/gpodder/gpodder.py:304 src/gpodder/gpodder.py:439 +#: src/gpodder/gpodder.py:317 src/gpodder/gpodder.py:452 msgid "Fetching channel index..." msgstr "" -#: src/gpodder/gpodder.py:317 +#: src/gpodder/gpodder.py:330 msgid "" "Could not add new channel.\n" "Only http:// and ftp:// URLs supported at the moment." msgstr "" -#: src/gpodder/gpodder.py:328 src/gpodder/gpodder.py:341 +#: src/gpodder/gpodder.py:341 src/gpodder/gpodder.py:354 #, python-format msgid "" "Cannot access iPod at %s.\n" "Make sure your iPod is connected and mounted." msgstr "" -#: src/gpodder/gpodder.py:371 +#: src/gpodder/gpodder.py:384 msgid "" "Updating feed cache\n" "\n" @@ -117,14 +117,14 @@ msgid "" "updating the feed cache..." msgstr "" -#: src/gpodder/gpodder.py:432 +#: src/gpodder/gpodder.py:445 msgid "" "Cannot edit this channel.\n" "\n" "No channel found." msgstr "" -#: src/gpodder/gpodder.py:461 +#: src/gpodder/gpodder.py:474 #, python-format msgid "" "Do you really want to remove this channel?\n" @@ -132,35 +132,35 @@ msgid "" " %s" msgstr "" -#: src/gpodder/gpodder.py:468 +#: src/gpodder/gpodder.py:481 msgid "" "Could not delete channel.\n" "Probably no channel is selected." msgstr "" -#: src/gpodder/gpodder.py:476 +#: src/gpodder/gpodder.py:489 msgid "Your channel list is empty. Nothing to export." msgstr "" -#: src/gpodder/gpodder.py:478 +#: src/gpodder/gpodder.py:491 msgid "Export to OPML" msgstr "" -#: src/gpodder/gpodder.py:507 +#: src/gpodder/gpodder.py:520 msgid "translator-credits" msgstr "" -#: src/gpodder/gpodder.py:547 +#: src/gpodder/gpodder.py:560 msgid "You have not selected an episode to download." msgstr "" -#: src/gpodder/gpodder.py:562 +#: src/gpodder/gpodder.py:575 msgid "" "You have already downloaded this episode\n" "or you are currently downloading it." msgstr "" -#: src/gpodder/gpodder.py:587 +#: src/gpodder/gpodder.py:600 #, python-format msgid "" "Do you really want to cancel this download?\n" @@ -168,11 +168,11 @@ msgid "" "%s" msgstr "" -#: src/gpodder/gpodder.py:590 src/gpodder/gpodder.py:627 +#: src/gpodder/gpodder.py:603 src/gpodder/gpodder.py:640 msgid "No episode selected." msgstr "" -#: src/gpodder/gpodder.py:653 +#: src/gpodder/gpodder.py:666 #, python-format msgid "" "Do you really want to remove this episode?\n" @@ -180,68 +180,68 @@ msgid "" "%s" msgstr "" -#: src/gpodder/gpodder.py:663 +#: src/gpodder/gpodder.py:676 msgid "Could not delete downloaded podcast." msgstr "" -#: src/gpodder/gpodder.py:701 src/gpodder/gpodder.py:702 +#: src/gpodder/gpodder.py:714 src/gpodder/gpodder.py:715 #: data/gpodder.glade.h:1 msgid "(unknown)" msgstr "" -#: src/gpodder/gpodder.py:919 +#: src/gpodder/gpodder.py:933 #, python-format msgid "%d of %d" msgstr "" -#: src/gpodder/gpodder.py:962 +#: src/gpodder/gpodder.py:976 msgid "" "Please do not call gpodder.py directly. Instead, call the gpodder binary." msgstr "" -#: src/gpodder/libgpodder.py:78 +#: src/gpodder/libgpodder.py:93 msgid "gPodder downloads" msgstr "" -#: src/gpodder/libgpodder.py:226 +#: src/gpodder/libgpodder.py:241 msgid "Downloading channel cover..." msgstr "" -#: src/gpodder/libgpodder.py:277 +#: src/gpodder/libgpodder.py:292 msgid "gPodder channel list" msgstr "" -#: src/gpodder/libipodsync.py:78 +#: src/gpodder/libipodsync.py:95 msgid "Saving iPod database..." msgstr "" -#: src/gpodder/libipodsync.py:160 +#: src/gpodder/libipodsync.py:178 #, python-format msgid "Complete: %s" msgstr "" -#: src/gpodder/liblocdbwriter.py:34 +#: src/gpodder/liblocdbwriter.py:49 msgid "local download database, generated by gPodder" msgstr "" -#: src/gpodder/libopmlwriter.py:26 +#: src/gpodder/libopmlwriter.py:41 msgid "gPodder subscription list (exported)" msgstr "" -#: src/gpodder/libpodcasts.py:284 +#: src/gpodder/libpodcasts.py:299 msgid "No LocalDB found or error in existing LocalDB." msgstr "" -#: src/gpodder/libwget.py:40 src/gpodder/libwget.py:58 -#: src/gpodder/libwget.py:67 +#: src/gpodder/libwget.py:55 src/gpodder/libwget.py:73 +#: src/gpodder/libwget.py:82 msgid "unknown" msgstr "" -#: src/gpodder/libwget.py:276 +#: src/gpodder/libwget.py:291 msgid "Download has been cancelled." msgstr "" -#: src/gpodder/libwget.py:278 +#: src/gpodder/libwget.py:293 #, python-format msgid "Download error. Wget exit code was: %d" msgstr "" @@ -458,38 +458,38 @@ msgstr "" msgid "iPod:" msgstr "" -#: bin/gpodder:39 +#: bin/gpodder:59 msgid "Be more verbose" msgstr "" -#: bin/gpodder:43 +#: bin/gpodder:63 msgid "Run local version in current directory" msgstr "" -#: bin/gpodder:47 +#: bin/gpodder:67 msgid "List all channel subscriptions" msgstr "" -#: bin/gpodder:51 +#: bin/gpodder:71 msgid "Update channel list, download new podcasts" msgstr "" -#: bin/gpodder:55 +#: bin/gpodder:75 msgid "Update channel list and exit" msgstr "" -#: bin/gpodder:58 +#: bin/gpodder:78 msgid "Subscribe to channel from FEEDURL" msgstr "" -#: bin/gpodder:61 +#: bin/gpodder:81 msgid "Delete channel with ID n" msgstr "" -#: bin/gpodder:79 +#: bin/gpodder:99 msgid "Error: cannot find wget." msgstr "" -#: bin/gpodder:102 +#: bin/gpodder:122 msgid "Channel IDs may have changed, list before deleting again." msgstr "" diff --git a/data/po/de.po b/data/po/de.po index ae141650..f7ba5672 100644 --- a/data/po/de.po +++ b/data/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gPodder 0.7-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-07 16:03+0200\n" +"POT-Creation-Date: 2006-04-07 21:58+0200\n" "PO-Revision-Date: 2006-04-07 16:05+0100\n" "Last-Translator: Thomas Perl \n" "Language-Team: gPodder Team \n" @@ -16,47 +16,46 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" -#: src/gpodder/console.py:64 +#: src/gpodder/console.py:85 #, python-format msgid "delete channel: %s" msgstr "Channel entfernen: %s" -#: src/gpodder/console.py:67 +#: src/gpodder/console.py:88 #, python-format msgid "%s is not a valid id" msgstr "%s is keine gültige ID" -#: src/gpodder/gpodder.py:57 +#: src/gpodder/gpodder.py:70 msgid "Contributors / patch writers:" msgstr "Helfer und Patchschreiber:" -#: src/gpodder/gpodder.py:61 +#: src/gpodder/gpodder.py:74 msgid "See the AUTHORS file for all contributors" msgstr "Eine Liste aller Helfer finden Sie in der AUTHORS-Datei" -#: src/gpodder/gpodder.py:118 -#: src/gpodder/gpodder.py:133 -#: src/gpodder/gpodder.py:139 +#: src/gpodder/gpodder.py:131 src/gpodder/gpodder.py:146 +#: src/gpodder/gpodder.py:152 msgid "Episode" msgstr "Episode" -#: src/gpodder/gpodder.py:123 +#: src/gpodder/gpodder.py:136 msgid "Size" msgstr "Größe" -#: src/gpodder/gpodder.py:142 +#: src/gpodder/gpodder.py:155 msgid "Speed" msgstr "Geschwindigkeit" -#: src/gpodder/gpodder.py:145 +#: src/gpodder/gpodder.py:158 msgid "Progress" msgstr "Fortschritt" -#: src/gpodder/gpodder.py:169 +#: src/gpodder/gpodder.py:182 msgid "Channel Info" msgstr "Channel-Informationen" -#: src/gpodder/gpodder.py:186 +#: src/gpodder/gpodder.py:199 #, python-format msgid "" "gPodder development version %s\n" @@ -65,33 +64,35 @@ msgstr "" "gPodder Entwicklungs-Version %s\n" "Benutzung auf eigene Gefahr. Viel Spaß mit neuen Features :)" -#: src/gpodder/gpodder.py:213 +#: src/gpodder/gpodder.py:226 msgid "No downloaded podcasts found." msgstr "Keine heruntergeladenen Podcasts gefunden." -#: src/gpodder/gpodder.py:223 +#: src/gpodder/gpodder.py:236 msgid "" "No channels found\n" "\n" -"Click on Channels > Add channel.. to add a new channel." +"Click on Channels > Add channel.. to add a " +"new channel." msgstr "" "Keine Channels gefunden\n" "\n" -"Klicken Sie auf Channels > Abbonieren..., um einen neuen Channel zu abbonieren." +"Klicken Sie auf Channels > Abbonieren..., um " +"einen neuen Channel zu abbonieren." -#: src/gpodder/gpodder.py:225 +#: src/gpodder/gpodder.py:238 msgid "gPodder message" msgstr "gPodder Nachricht" -#: src/gpodder/gpodder.py:233 +#: src/gpodder/gpodder.py:246 msgid "Do you really want to do this?" msgstr "Willst du das wirklich machen?" -#: src/gpodder/gpodder.py:233 +#: src/gpodder/gpodder.py:246 msgid "gPodder confirmation" msgstr "gPodder Bestätigung" -#: src/gpodder/gpodder.py:298 +#: src/gpodder/gpodder.py:311 msgid "" "There has been an error adding the channel.\n" "Maybe the URL is wrong?" @@ -99,12 +100,11 @@ msgstr "" "Ein Fehler trat beim Hinzufügen des Channels auf.\n" "Vielleicht ist die URL falsch?" -#: src/gpodder/gpodder.py:304 -#: src/gpodder/gpodder.py:439 +#: src/gpodder/gpodder.py:317 src/gpodder/gpodder.py:452 msgid "Fetching channel index..." msgstr "Channel-Index wird heruntergeladen..." -#: src/gpodder/gpodder.py:317 +#: src/gpodder/gpodder.py:330 msgid "" "Could not add new channel.\n" "Only http:// and ftp:// URLs supported at the moment." @@ -112,8 +112,7 @@ msgstr "" "Konnte neuen Channel nicht abbonieren.\n" "Derzeit werden nur http:// und ftp://-URLs unterstützt." -#: src/gpodder/gpodder.py:328 -#: src/gpodder/gpodder.py:341 +#: src/gpodder/gpodder.py:341 src/gpodder/gpodder.py:354 #, python-format msgid "" "Cannot access iPod at %s.\n" @@ -122,7 +121,7 @@ msgstr "" "Kann auf den iPod in %s nicht zugreifen.\n" "Bitte sicherstellen, dass der iPod angesteckt und eingebunden ist." -#: src/gpodder/gpodder.py:371 +#: src/gpodder/gpodder.py:384 msgid "" "Updating feed cache\n" "\n" @@ -134,7 +133,7 @@ msgstr "" "Bitte warten Sie, während gPodder Ihre\n" "Channel-Abonnements aktualisiert..." -#: src/gpodder/gpodder.py:432 +#: src/gpodder/gpodder.py:445 msgid "" "Cannot edit this channel.\n" "\n" @@ -144,7 +143,7 @@ msgstr "" "\n" "Kein Channel gefunden." -#: src/gpodder/gpodder.py:461 +#: src/gpodder/gpodder.py:474 #, python-format msgid "" "Do you really want to remove this channel?\n" @@ -155,7 +154,7 @@ msgstr "" "\n" "%s" -#: src/gpodder/gpodder.py:468 +#: src/gpodder/gpodder.py:481 msgid "" "Could not delete channel.\n" "Probably no channel is selected." @@ -163,23 +162,23 @@ msgstr "" "Konnte Channel nicht entfernen.\n" "Wahrscheinlich ist keiner ausgewählt." -#: src/gpodder/gpodder.py:476 +#: src/gpodder/gpodder.py:489 msgid "Your channel list is empty. Nothing to export." msgstr "Nichts zu exportieren: Sie haben keine Abonnements." -#: src/gpodder/gpodder.py:478 +#: src/gpodder/gpodder.py:491 msgid "Export to OPML" msgstr "Als OPML-Datei exportieren" -#: src/gpodder/gpodder.py:507 +#: src/gpodder/gpodder.py:520 msgid "translator-credits" msgstr "Thomas Perl " -#: src/gpodder/gpodder.py:547 +#: src/gpodder/gpodder.py:560 msgid "You have not selected an episode to download." msgstr "Sie haben keine Episode für den Download ausgewählt." -#: src/gpodder/gpodder.py:562 +#: src/gpodder/gpodder.py:575 msgid "" "You have already downloaded this episode\n" "or you are currently downloading it." @@ -187,7 +186,7 @@ msgstr "" "Sie haben diese Episode bereits heruntergeladen\n" "oder Sie laden sie jetzt gerade herunter." -#: src/gpodder/gpodder.py:587 +#: src/gpodder/gpodder.py:600 #, python-format msgid "" "Do you really want to cancel this download?\n" @@ -198,12 +197,11 @@ msgstr "" "\n" "%s" -#: src/gpodder/gpodder.py:590 -#: src/gpodder/gpodder.py:627 +#: src/gpodder/gpodder.py:603 src/gpodder/gpodder.py:640 msgid "No episode selected." msgstr "Keine Episode ausgewählt." -#: src/gpodder/gpodder.py:653 +#: src/gpodder/gpodder.py:666 #, python-format msgid "" "Do you really want to remove this episode?\n" @@ -214,69 +212,71 @@ msgstr "" "\n" "%s" -#: src/gpodder/gpodder.py:663 +#: src/gpodder/gpodder.py:676 msgid "Could not delete downloaded podcast." msgstr "Konnte den ausgewählten Podcast nicht entfernen." -#: src/gpodder/gpodder.py:701 -#: src/gpodder/gpodder.py:702 +#: src/gpodder/gpodder.py:714 src/gpodder/gpodder.py:715 #: data/gpodder.glade.h:1 msgid "(unknown)" msgstr "(unbekannt)" -#: src/gpodder/gpodder.py:919 +#: src/gpodder/gpodder.py:933 #, python-format msgid "%d of %d" msgstr "%d von %d" -#: src/gpodder/gpodder.py:962 -msgid "Please do not call gpodder.py directly. Instead, call the gpodder binary." -msgstr "Bitte starten Sie gPodder nie direkt über gpodder.py. Rufen Sie stattdessen das \"gpodder\" Programm auf." +#: src/gpodder/gpodder.py:976 +msgid "" +"Please do not call gpodder.py directly. Instead, call the gpodder binary." +msgstr "" +"Bitte starten Sie gPodder nie direkt über gpodder.py. Rufen Sie stattdessen " +"das \"gpodder\" Programm auf." -#: src/gpodder/libgpodder.py:78 +#: src/gpodder/libgpodder.py:93 msgid "gPodder downloads" msgstr "gPodder Downloads" -#: src/gpodder/libgpodder.py:226 +#: src/gpodder/libgpodder.py:241 msgid "Downloading channel cover..." msgstr "Bild wird heruntergeladen..." -#: src/gpodder/libgpodder.py:277 +#: src/gpodder/libgpodder.py:292 msgid "gPodder channel list" msgstr "gPodder Channel-Editor" -#: src/gpodder/libipodsync.py:78 +#: src/gpodder/libipodsync.py:95 msgid "Saving iPod database..." msgstr "Speichere iPod-Datenbank..." -#: src/gpodder/libipodsync.py:160 +#: src/gpodder/libipodsync.py:178 #, python-format msgid "Complete: %s" msgstr "Fertig: %s" -#: src/gpodder/liblocdbwriter.py:34 +#: src/gpodder/liblocdbwriter.py:49 msgid "local download database, generated by gPodder" msgstr "lokale Download-Datenbank, generiert von gPodder" -#: src/gpodder/libopmlwriter.py:26 +#: src/gpodder/libopmlwriter.py:41 msgid "gPodder subscription list (exported)" msgstr "gPodder Abonnement-Liste (exportiert)" -#: src/gpodder/libpodcasts.py:284 +#: src/gpodder/libpodcasts.py:299 msgid "No LocalDB found or error in existing LocalDB." -msgstr "Keine Lokale Datenbank gefunden (oder Fehler in existierender Datenbank)." +msgstr "" +"Keine Lokale Datenbank gefunden (oder Fehler in existierender Datenbank)." -#: src/gpodder/libwget.py:40 -#: src/gpodder/libwget.py:58 -#: src/gpodder/libwget.py:67 +#: src/gpodder/libwget.py:55 src/gpodder/libwget.py:73 +#: src/gpodder/libwget.py:82 msgid "unknown" msgstr "unbekannt" -#: src/gpodder/libwget.py:276 +#: src/gpodder/libwget.py:291 msgid "Download has been cancelled." msgstr "Der Download wurde abgebrochen." -#: src/gpodder/libwget.py:278 +#: src/gpodder/libwget.py:293 #, python-format msgid "Download error. Wget exit code was: %d" msgstr "Fehler beim Download. Wget's Exit-Status ist: %d" @@ -497,42 +497,43 @@ msgstr "iPod Einh msgid "iPod:" msgstr "iPod:" -#: bin/gpodder:39 +#: bin/gpodder:59 msgid "Be more verbose" msgstr "Detailliertere Ausgabe" -#: bin/gpodder:43 +#: bin/gpodder:63 msgid "Run local version in current directory" msgstr "Lokale Version im Arbeitsverzeichnis starten" -#: bin/gpodder:47 +#: bin/gpodder:67 msgid "List all channel subscriptions" msgstr "Alle Channel-Abonnements anzeigen" -#: bin/gpodder:51 +#: bin/gpodder:71 msgid "Update channel list, download new podcasts" msgstr "Channel-Liste aktualisieren und neue Podcasts herunterladen" -#: bin/gpodder:55 +#: bin/gpodder:75 msgid "Update channel list and exit" msgstr "nur Channel-Liste aktualisieren" -#: bin/gpodder:58 +#: bin/gpodder:78 msgid "Subscribe to channel from FEEDURL" msgstr "Channel auf FEEDURL abonnieren" -#: bin/gpodder:61 +#: bin/gpodder:81 msgid "Delete channel with ID n" msgstr "Channel mit der ID n entfernen" -#: bin/gpodder:79 +#: bin/gpodder:99 msgid "Error: cannot find wget." msgstr "Fehler: kann wget nicht finden." -#: bin/gpodder:102 +#: bin/gpodder:122 msgid "Channel IDs may have changed, list before deleting again." -msgstr "Channel IDs könnten sich verändert haben. Bitte vor dem nächsten Löschen zuerst Channel-Liste anzeigen lassen." +msgstr "" +"Channel IDs könnten sich verändert haben. Bitte vor dem nächsten Löschen " +"zuerst Channel-Liste anzeigen lassen." #~ msgid "Saving iTunesDB..." #~ msgstr "Speichere iTunesDB..." - diff --git a/data/po/fr.po b/data/po/fr.po index 8ceb9ff4..3643908d 100644 --- a/data/po/fr.po +++ b/data/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gPodder 0.7-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-07 16:03+0200\n" +"POT-Creation-Date: 2006-04-07 21:58+0200\n" "PO-Revision-Date: 2006-04-06 15:37+0100\n" "Last-Translator: Thomas Perl \n" "Language-Team: LANGUAGE \n" @@ -17,46 +17,46 @@ msgstr "" "X-Poedit-SourceCharset: iso-8859-1\n" "X-Poedit-Language: French\n" -#: src/gpodder/console.py:64 +#: src/gpodder/console.py:85 #, python-format msgid "delete channel: %s" msgstr "supprimer le flux: %s" -#: src/gpodder/console.py:67 +#: src/gpodder/console.py:88 #, python-format msgid "%s is not a valid id" msgstr "%s n'est pas un ID valide" -#: src/gpodder/gpodder.py:57 +#: src/gpodder/gpodder.py:70 msgid "Contributors / patch writers:" msgstr "Contributeurs:" -#: src/gpodder/gpodder.py:61 +#: src/gpodder/gpodder.py:74 msgid "See the AUTHORS file for all contributors" msgstr "Voir le fichier AUTHORS pour la liste complète des contributeurs." -#: src/gpodder/gpodder.py:118 src/gpodder/gpodder.py:133 -#: src/gpodder/gpodder.py:139 +#: src/gpodder/gpodder.py:131 src/gpodder/gpodder.py:146 +#: src/gpodder/gpodder.py:152 msgid "Episode" msgstr "Émission" -#: src/gpodder/gpodder.py:123 +#: src/gpodder/gpodder.py:136 msgid "Size" msgstr "Taille" -#: src/gpodder/gpodder.py:142 +#: src/gpodder/gpodder.py:155 msgid "Speed" msgstr "Vitesse" -#: src/gpodder/gpodder.py:145 +#: src/gpodder/gpodder.py:158 msgid "Progress" msgstr "Progression" -#: src/gpodder/gpodder.py:169 +#: src/gpodder/gpodder.py:182 msgid "Channel Info" msgstr "Informations sur le flux RSS" -#: src/gpodder/gpodder.py:186 +#: src/gpodder/gpodder.py:199 #, python-format msgid "" "gPodder development version %s\n" @@ -65,11 +65,11 @@ msgstr "" "Ceci est la version de développement %s de gPodder\n" "Cette version est instable mais comprend de nouvelles fonctionnalités :)" -#: src/gpodder/gpodder.py:213 +#: src/gpodder/gpodder.py:226 msgid "No downloaded podcasts found." msgstr "Aucun podcast n'a été encore téléchargé." -#: src/gpodder/gpodder.py:223 +#: src/gpodder/gpodder.py:236 msgid "" "No channels found\n" "\n" @@ -81,19 +81,19 @@ msgstr "" "Cliquer sur Flux > Ajouter un flux RSS.. pour " "ajouter un nouveau flux RSS." -#: src/gpodder/gpodder.py:225 +#: src/gpodder/gpodder.py:238 msgid "gPodder message" msgstr "Message gPodder" -#: src/gpodder/gpodder.py:233 +#: src/gpodder/gpodder.py:246 msgid "Do you really want to do this?" msgstr "Voulez vous continuer ?" -#: src/gpodder/gpodder.py:233 +#: src/gpodder/gpodder.py:246 msgid "gPodder confirmation" msgstr "Demande de confirmation gpodder" -#: src/gpodder/gpodder.py:298 +#: src/gpodder/gpodder.py:311 msgid "" "There has been an error adding the channel.\n" "Maybe the URL is wrong?" @@ -101,11 +101,11 @@ msgstr "" "L'ajout du flux a echoué.\n" "L'URL est sans doute erronée?" -#: src/gpodder/gpodder.py:304 src/gpodder/gpodder.py:439 +#: src/gpodder/gpodder.py:317 src/gpodder/gpodder.py:452 msgid "Fetching channel index..." msgstr "Récupération de l'index du flux RSS" -#: src/gpodder/gpodder.py:317 +#: src/gpodder/gpodder.py:330 msgid "" "Could not add new channel.\n" "Only http:// and ftp:// URLs supported at the moment." @@ -114,14 +114,14 @@ msgstr "" "Seules les URL http:// et ftp:// sont supportées pour le " "moment." -#: src/gpodder/gpodder.py:328 src/gpodder/gpodder.py:341 +#: src/gpodder/gpodder.py:341 src/gpodder/gpodder.py:354 #, python-format msgid "" "Cannot access iPod at %s.\n" "Make sure your iPod is connected and mounted." msgstr "" -#: src/gpodder/gpodder.py:371 +#: src/gpodder/gpodder.py:384 msgid "" "Updating feed cache\n" "\n" @@ -133,7 +133,7 @@ msgstr "" "Merci de patienter pendant que gpodder met\n" "à jour le cache des flux RSS..." -#: src/gpodder/gpodder.py:432 +#: src/gpodder/gpodder.py:445 msgid "" "Cannot edit this channel.\n" "\n" @@ -143,7 +143,7 @@ msgstr "" "\n" "Flux RSS introuvable." -#: src/gpodder/gpodder.py:461 +#: src/gpodder/gpodder.py:474 #, python-format msgid "" "Do you really want to remove this channel?\n" @@ -154,7 +154,7 @@ msgstr "" "\n" "%s" -#: src/gpodder/gpodder.py:468 +#: src/gpodder/gpodder.py:481 msgid "" "Could not delete channel.\n" "Probably no channel is selected." @@ -162,23 +162,23 @@ msgstr "" "Impossible de supprimer ce flux.\n" "Il n'y a sans doute pas de flux selectionné." -#: src/gpodder/gpodder.py:476 +#: src/gpodder/gpodder.py:489 msgid "Your channel list is empty. Nothing to export." msgstr "Votre liste de flux est vide. Il n'y a rien à exporter." -#: src/gpodder/gpodder.py:478 +#: src/gpodder/gpodder.py:491 msgid "Export to OPML" msgstr "Exporter au format OPML" -#: src/gpodder/gpodder.py:507 +#: src/gpodder/gpodder.py:520 msgid "translator-credits" msgstr "Alain Tauch " -#: src/gpodder/gpodder.py:547 +#: src/gpodder/gpodder.py:560 msgid "You have not selected an episode to download." msgstr "Vous n'avez pas selectionné d'émission à télécharger." -#: src/gpodder/gpodder.py:562 +#: src/gpodder/gpodder.py:575 msgid "" "You have already downloaded this episode\n" "or you are currently downloading it." @@ -186,7 +186,7 @@ msgstr "" "Vous avez déjà téléchargé cette émission\n" "ou elle est en cours de téléchargement." -#: src/gpodder/gpodder.py:587 +#: src/gpodder/gpodder.py:600 #, python-format msgid "" "Do you really want to cancel this download?\n" @@ -197,11 +197,11 @@ msgstr "" "\n" "%s" -#: src/gpodder/gpodder.py:590 src/gpodder/gpodder.py:627 +#: src/gpodder/gpodder.py:603 src/gpodder/gpodder.py:640 msgid "No episode selected." msgstr "Aucune émission sélectionnée." -#: src/gpodder/gpodder.py:653 +#: src/gpodder/gpodder.py:666 #, python-format msgid "" "Do you really want to remove this episode?\n" @@ -212,70 +212,70 @@ msgstr "" "\n" "%s" -#: src/gpodder/gpodder.py:663 +#: src/gpodder/gpodder.py:676 msgid "Could not delete downloaded podcast." msgstr "La suppression du podcast a échouée" -#: src/gpodder/gpodder.py:701 src/gpodder/gpodder.py:702 +#: src/gpodder/gpodder.py:714 src/gpodder/gpodder.py:715 #: data/gpodder.glade.h:1 msgid "(unknown)" msgstr "(inconnu(e))" -#: src/gpodder/gpodder.py:919 +#: src/gpodder/gpodder.py:933 #, python-format msgid "%d of %d" msgstr "" -#: src/gpodder/gpodder.py:962 +#: src/gpodder/gpodder.py:976 msgid "" "Please do not call gpodder.py directly. Instead, call the gpodder binary." msgstr "" "Merci de ne pas lancer gpodder.py directement. Utilisez plutôt le binaire " "gpodder." -#: src/gpodder/libgpodder.py:78 +#: src/gpodder/libgpodder.py:93 msgid "gPodder downloads" msgstr "Téléchargements gPodder" -#: src/gpodder/libgpodder.py:226 +#: src/gpodder/libgpodder.py:241 msgid "Downloading channel cover..." msgstr "Téléchargement du logo" -#: src/gpodder/libgpodder.py:277 +#: src/gpodder/libgpodder.py:292 msgid "gPodder channel list" msgstr "Liste des flux RSS gPodder" -#: src/gpodder/libipodsync.py:78 +#: src/gpodder/libipodsync.py:95 msgid "Saving iPod database..." msgstr "" -#: src/gpodder/libipodsync.py:160 +#: src/gpodder/libipodsync.py:178 #, python-format msgid "Complete: %s" msgstr "" -#: src/gpodder/liblocdbwriter.py:34 +#: src/gpodder/liblocdbwriter.py:49 msgid "local download database, generated by gPodder" msgstr "Base de donnée locale, générée par gPodder" -#: src/gpodder/libopmlwriter.py:26 +#: src/gpodder/libopmlwriter.py:41 msgid "gPodder subscription list (exported)" msgstr "Liste des flux RSS de gPodder (export)" -#: src/gpodder/libpodcasts.py:284 +#: src/gpodder/libpodcasts.py:299 msgid "No LocalDB found or error in existing LocalDB." msgstr "Base de donnée introuvable ou corrompue" -#: src/gpodder/libwget.py:40 src/gpodder/libwget.py:58 -#: src/gpodder/libwget.py:67 +#: src/gpodder/libwget.py:55 src/gpodder/libwget.py:73 +#: src/gpodder/libwget.py:82 msgid "unknown" msgstr "inconnu(e)" -#: src/gpodder/libwget.py:276 +#: src/gpodder/libwget.py:291 msgid "Download has been cancelled." msgstr "Le téléchargement a été annulé." -#: src/gpodder/libwget.py:278 +#: src/gpodder/libwget.py:293 #, python-format msgid "Download error. Wget exit code was: %d" msgstr "Erreur de téléchargement. Code de retour de wget: %d" @@ -498,39 +498,39 @@ msgstr "" msgid "iPod:" msgstr "" -#: bin/gpodder:39 +#: bin/gpodder:59 msgid "Be more verbose" msgstr "mode verbeux" -#: bin/gpodder:43 +#: bin/gpodder:63 msgid "Run local version in current directory" msgstr "Lance la version locale de gPodder" -#: bin/gpodder:47 +#: bin/gpodder:67 msgid "List all channel subscriptions" msgstr "Affiche la liste des flux RSS" -#: bin/gpodder:51 +#: bin/gpodder:71 msgid "Update channel list, download new podcasts" msgstr "Met à jour la liste des flux RSS, télécharge les nouveaux podcasts" -#: bin/gpodder:55 +#: bin/gpodder:75 msgid "Update channel list and exit" msgstr "Met à jour la liste des flux RSS" -#: bin/gpodder:58 +#: bin/gpodder:78 msgid "Subscribe to channel from FEEDURL" msgstr "Ajoute le flux RSS FEEDURL" -#: bin/gpodder:61 +#: bin/gpodder:81 msgid "Delete channel with ID n" msgstr "Supprimer le flux RSS dont l'ID est n" -#: bin/gpodder:79 +#: bin/gpodder:99 msgid "Error: cannot find wget." msgstr "Erreur: wget introuvable." -#: bin/gpodder:102 +#: bin/gpodder:122 msgid "Channel IDs may have changed, list before deleting again." msgstr "" "Les IDs des flux ont pu changer, relister avant de supprimer un autre flux " diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index a26f2e8a..00000000 --- a/debian/README.Debian +++ /dev/null @@ -1,5 +0,0 @@ -gpodder for Debian - -Created automatically by dh_make (distutils 2.4.0) - --- Peter Hoffmann , Thu Mar 30 21:32:21 2006 CEST diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index c0de5860..00000000 --- a/debian/changelog +++ /dev/null @@ -1,35 +0,0 @@ -gpodder (0.7+svn20060407-3) unstable; urgency=low - - * Bug in gpodder's add channel functionality - fixed. - - -- Thomas Perl Fri, 7 Apr 2006 20:35:41 +0200 - -gpodder (0.7+svn20060407-2) unstable; urgency=low - - * New upstream updates (see ChangeLog) - - -- Thomas Perl Fri, 7 Apr 2006 20:09:21 +0200 - -gpodder (0.7+svn20060407-1) unstable; urgency=low - - * New upstream update - * gPodder package now "suggests" python-gpod and python-eyed3 - (this is needed because of a new optional dependency for iPod support) - - -- Thomas Perl Fri, 7 Apr 2006 04:51:57 +0200 - -gpodder (0.7svn-1) unstable; urgency=low - - * added longer description - * Using most recent codebase from svn - * Call generators on installation (for translations files) - * Create package for "distribution default" python installation - - -- Thomas Perl Wed, 5 Apr 2006 16:46:15 +0200 - -gpodder (0.7+svn20060330-1) unstable; urgency=low - - * Initial packaging - * Created automatically by dh_make (distutils 2.4.0) - - -- Peter Hoffmann Thu, 30 Mar 2006 22:47:07 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b8626c4c..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/debian/control b/debian/control deleted file mode 100644 index f9b4e714..00000000 --- a/debian/control +++ /dev/null @@ -1,20 +0,0 @@ -Source: gpodder -Maintainer: Peter Hoffmann -Uploaders: Thomas Perl -Section: python -Priority: optional -Standards-Version: 3.6.2 -Build-Depends-Indep: debhelper (>= 4.1.67), python-dev, help2man, intltool - -Package: gpodder -Architecture: all -Depends: ${python:Depends}, python-gtk2, python-glade2, python-xml, wget -Suggests: python-gpod, python-eyed3 -Description: a media aggregator / podcast catcher - gPodder enables you to download and organize podcasts. You can - subscribe to many RSS feeds from the internet and download the - episodes you are interested in. gPodder targets to be easy to - use and lightweight. - . - This package includes the GTK2 GUI and the command-line interface. - diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index a8b9f91c..00000000 --- a/debian/copyright +++ /dev/null @@ -1,12 +0,0 @@ -This package was automatically debianized by Peter Hoffmann - on Thursday, 30 March, 2006 using dh_make (distutils -2.4.0) - -The homepage for the original package is http://perli.net/projekte/gpodder/ - -Upstream Author: Thomas Perl - -License: GPL - -On Debian systems, the text of the GPL license can be found at -/usr/share/common-licenses/GPL diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 305a9214..00000000 --- a/debian/rules +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -PYTHON_VERSIONS = '' -IS_PURE = yes -HAVE_DH_PYTHON = yes -DUMMY_PACKAGE = -CHANGELOG = ChangeLog -ARCHITECTURE = all # architecture for binary packages - -PYTHON = /usr/bin/python${PYTHON_VERSION} -SETUP_PY = setup.py -SETUP = ${PYTHON} ${SETUP_PY} -DEBPACKAGE = gpodder -DESTDIR = ${CURDIR}/debian/${DEBPACKAGE} - -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -export CFLAGS - -ifeq (,$(wildcard PKG-INFO)) - PKG_INFO = debian/PKG-INFO # generate our own PKG-INFO -else - PKG_INFO = PKG-INFO # use the distributed one -endif - -# Macro to run setup.py once for each of the PYTHON_VERSIONS -echo_and_run = { echo $(1); $(1); } -foreach_python_version\ - = @$(foreach PYTHON_VERSION, ${PYTHON_VERSIONS}, \ - $(call echo_and_run, ${$(firstword $(1))_CMD}) \ - && ) true -# Commands which can be run by the foreach_python_version macro: -SETUP_CLEAN_CMD = ${SETUP} clean --all -SETUP_BUILD_CMD = ${SETUP} build -SETUP_INSTALL_CMD= ${SETUP} install --root='${DESTDIR}' --no-compile -DH_PYTHON_CMD = dh_python -p ${DEBPACKAGE} - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - touch configure-stamp - -build: build-stamp $(PKG_INFO) -build-stamp: configure-stamp - dh_testdir - $(call foreach_python_version, SETUP_BUILD) - touch build-stamp - -debian/PKG-INFO: ${SETUP_PY} - @echo generating $@; \ - python -c 'import sys; from distutils.core import run_setup; \ - run_setup(sys.argv[1]).metadata.write_pkg_info("debian")' $< - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - rm -f debian/PKG-INFO - $(call foreach_python_version, SETUP_CLEAN) - rm -rf build dist - dh_clean --exclude 'gpodder.py.orig' - make clean - -install: build - dh_testdir - dh_testroot - dh_clean -k --exclude 'gpodder.py.orig' - dh_installdirs - make generators - $(call foreach_python_version, SETUP_INSTALL) - - -binary-indep: build install dummy-package -binary-arch: build install - -export DH_OPTIONS = - -ifeq (${ARCHITECTURE},all) - binary-indep: real-packages -else - binary-arch: real-packages -endif - -# Build the real packages -ifdef DUMMY_PACKAGE -real-packages: DH_OPTIONS = -N${DUMMY_PACKAGE} -endif -real-packages: - @echo DH_OPTIONS=$$DH_OPTIONS - dh_testdir - dh_testroot - dh_installchangelogs $(CHANGELOG) - dh_installdocs -A $(PKG_INFO) - dh_installexamples - dh_installman -ifndef IS_PURE - dh_strip -endif - dh_compress - dh_fixperms -ifdef HAVE_DH_PYTHON - $(call foreach_python_version, DH_PYTHON) -endif - dh_installdeb -ifndef IS_PURE - dh_shlibdeps -endif - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build the dummy package -# -# There's not much to do, since the only content of the package -# is a symlink: -# -# /usr/share/doc/python- -> python- -# -dummy-package: DH_OPTIONS = -p${DUMMY_PACKAGE} -dummy-package: -ifdef DUMMY_PACKAGE - @echo DH_OPTIONS=$$DH_OPTIONS - dh_testdir - dh_testroot - dh_link - dh_fixperms - dh_gencontrol - dh_builddeb -endif - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure -.PHONY: dummy-package real-packages - - diff --git a/doc/dev/copyright_notice b/doc/dev/copyright_notice new file mode 100644 index 00000000..c84d6f30 --- /dev/null +++ b/doc/dev/copyright_notice @@ -0,0 +1,19 @@ +# +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# diff --git a/doc/dev/tepache b/doc/dev/tepache index 8d4a5b27..c26fdec9 100755 --- a/doc/dev/tepache +++ b/doc/dev/tepache @@ -19,6 +19,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA +# Modified by Thomas Perl to not write date info to +# output file (makes svn diffs extremely stupid long and stuff.. :/ ) import os import sys @@ -511,7 +513,6 @@ header_format = '''\ # Python module %(module)s # Autogenerated from %(glade)s -# Generated on %(date)s # Warning: Do not modify any context comment such as #-- # They are required to keep user's code diff --git a/doc/man/gpodder.1 b/doc/man/gpodder.1 index 8832907c..47b40b94 100644 --- a/doc/man/gpodder.1 +++ b/doc/man/gpodder.1 @@ -5,7 +5,7 @@ gpodder \- manual page for gpodder 0.7svn 2006-04-07 .SH DESCRIPTION usage: gpodder [options] arg1 arg2 .PP -gPodder Media Aggregator +gPodder media aggregator .SS "options:" .TP \fB\-\-version\fR diff --git a/setup.py b/setup.py index e70ac877..0daea427 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,24 @@ #!/usr/bin/env python -# gPodder setup script - +# +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# import glob import os diff --git a/src/gpodder/console.py b/src/gpodder/console.py index 8cf2a448..1ffeb133 100644 --- a/src/gpodder/console.py +++ b/src/gpodder/console.py @@ -1,5 +1,26 @@ # -*- coding: utf-8 -*- + +# +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + import os import time diff --git a/src/gpodder/gpodder.py b/src/gpodder/gpodder.py index dcf7d0a4..d3984a37 100644 --- a/src/gpodder/gpodder.py +++ b/src/gpodder/gpodder.py @@ -2,15 +2,28 @@ # Python module src/gpodder/gpodder.py # Autogenerated from gpodder.glade -# Generated on Fri Apr 7 20:36:24 2006 # Warning: Do not modify any context comment such as #-- # They are required to keep user's code # -# gPodder -# Copyright (c) 2005 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. # import os diff --git a/src/gpodder/gpodder.py.orig b/src/gpodder/gpodder.py.orig index 81d6f0fb..77fd7fd4 100644 --- a/src/gpodder/gpodder.py.orig +++ b/src/gpodder/gpodder.py.orig @@ -3,7 +3,6 @@ # Python module src/gpodder/gpodder.py # Autogenerated from gpodder.glade -# Generated on Fri Apr 7 20:36:24 2006 # Warning: Do not modify any context comment such as #-- # They are required to keep user's code diff --git a/src/gpodder/libgpodder.py b/src/gpodder/libgpodder.py index 53de6a57..fc1db4cf 100644 --- a/src/gpodder/libgpodder.py +++ b/src/gpodder/libgpodder.py @@ -1,8 +1,23 @@ + # -# gPodder -# Copyright (c) 2005 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. # # diff --git a/src/gpodder/libipodsync.py b/src/gpodder/libipodsync.py index f64bc316..24f29a73 100644 --- a/src/gpodder/libipodsync.py +++ b/src/gpodder/libipodsync.py @@ -1,8 +1,23 @@ + # -# gPodder -# Copyright (c) 2005-2006 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. # # diff --git a/src/gpodder/liblocaldb.py b/src/gpodder/liblocaldb.py index a60e384d..2df6ea6a 100644 --- a/src/gpodder/liblocaldb.py +++ b/src/gpodder/liblocaldb.py @@ -1,8 +1,23 @@ + # -# gPodder -# Copyright (c) 2005-2006 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. # # diff --git a/src/gpodder/liblocdbreader.py b/src/gpodder/liblocdbreader.py index d9d95727..ffc4b683 100644 --- a/src/gpodder/liblocdbreader.py +++ b/src/gpodder/liblocdbreader.py @@ -1,9 +1,25 @@ + # -# gPodder -# Copyright (c) 2005-2006 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + # # liblocdbreader.py -- xml reader functionality diff --git a/src/gpodder/liblocdbwriter.py b/src/gpodder/liblocdbwriter.py index e1c853f4..a118cffa 100644 --- a/src/gpodder/liblocdbwriter.py +++ b/src/gpodder/liblocdbwriter.py @@ -1,9 +1,24 @@ # -# gPodder -# Copyright (c) 2005-2006 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + # # liblocdbwriter.py -- rss output writer for your downloaded feeds diff --git a/src/gpodder/libopmlwriter.py b/src/gpodder/libopmlwriter.py index 860f92c9..b670cc92 100644 --- a/src/gpodder/libopmlwriter.py +++ b/src/gpodder/libopmlwriter.py @@ -1,9 +1,24 @@ # -# gPodder -# Copyright (c) 2005 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + # # libopmlwriter.py -- opml output writer for exports diff --git a/src/gpodder/libplayers.py b/src/gpodder/libplayers.py index 1db7d9b5..0abc55fb 100644 --- a/src/gpodder/libplayers.py +++ b/src/gpodder/libplayers.py @@ -1,9 +1,24 @@ # -# gPodder -# Copyright (c) 2005 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + # # libplayers.py -- get list of potential playback apps diff --git a/src/gpodder/libpodcasts.py b/src/gpodder/libpodcasts.py index 41d42809..47db75ce 100644 --- a/src/gpodder/libpodcasts.py +++ b/src/gpodder/libpodcasts.py @@ -1,9 +1,24 @@ # -# gPodder -# Copyright (c) 2005 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + # # libpodcasts.py -- data classes for gpodder diff --git a/src/gpodder/librssreader.py b/src/gpodder/librssreader.py index d6812f73..b02a7642 100644 --- a/src/gpodder/librssreader.py +++ b/src/gpodder/librssreader.py @@ -1,9 +1,24 @@ # -# gPodder -# Copyright (c) 2005 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + # # librssreader.py -- xml reader functionality diff --git a/src/gpodder/libwget.py b/src/gpodder/libwget.py index 636a9c40..6824a8ac 100644 --- a/src/gpodder/libwget.py +++ b/src/gpodder/libwget.py @@ -1,9 +1,24 @@ # -# gPodder -# Copyright (c) 2005 Thomas Perl -# Released under the GNU General Public License (GPL) +# gPodder (a media aggregator / podcast client) +# Copyright (C) 2005-2006 Thomas Perl # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + # # libwget.py -- wget download functionality