Corrections of corrections and some translated strings

configuration.py

@@ -188,7 +188,7 @@ class conf(object):
 		self.__currentdbversion = self.values["db_version"]
 		self.ReadConfig()
 		printf(_("Found running version: ") + self.values["config_version"] + "\n" +
-			_("Current version: ") + str(self.__currentversion)),
+			_("Current version: ") + str(self.__currentversion),
 			outputlevel="verbose", level=self.outputlevel, descriptor="stderr")
 		if self.values["config_version"] == "0" \
 		or int(self.values["config_version"]) < self.__currentversion:
@@ -212,7 +212,7 @@ class conf(object):
 		self.values["db_version"] = "0"
 		self.ReadConfig()
 		printf(_("Found running database version: ") + self.values["db_version"] +
-			"\n" + _("Current version: ") + str(self.__currentversion)),
+			"\n" + _("Current version: ") + str(self.__currentversion),
 			outputlevel="verbose", level=self.outputlevel, descriptor="stderr")
 		if self.values["db_version"] == "0" or \
 		int(self.values["db_version"]) < int(self.__currentdbversion):

locale/de/LC_MESSAGES/stov.po

@@ -1,256 +1,546 @@
-# German translation file for stov
+# GNU gettext file for stov, German language
 # Helmut Pozimski <helmut@pozimski.eu>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.2beta"
-"POT-Creation-Date: 2012-07-04 22:48+CEST\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: 0.3\n"
+"POT-Creation-Date: 2012-12-27 22:18+CET\n"
+"PO-Revision-Date: 2012-12-27 22:27+CET\n"
 "Last-Translator: Helmut Pozimski <helmut@pozimski.eu>\n"
-"Language-Team: Helmut Pozimski <helmut@pozimski.eu>\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF8\n"
-"Content-Transfer-Encoding: UTF8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
 
 #: configuration.py:56
+msgid "the name of your database file"
+msgstr "den Namen deiner Datenbankdatei"
+
+#: configuration.py:57
+msgid "the directory where downloaded videos are saved"
+msgstr "das Verzeichnis, in dem heruntergeladene Videos gespeichert werden"
+
+#: configuration.py:58
+msgid "the maximum number of videos to retrieve for each subscription"
+msgstr "die maximale Anzahl an Videos, die für jedes Abonnement heruntergeladen werden"
+
+#: configuration.py:60
+msgid "the host of your mail server"
+msgstr "die Adresse deiner Mailservers"
+
+#: configuration.py:61
+msgid "the address used for notifications"
+msgstr "die Empfängeradresse für Benachrichtigungs-Emails"
+
+#: configuration.py:62
+msgid "the sender address of notification e-mails"
+msgstr "die Absenderadresse für Benachrichtigungs-Emails"
+
+#: configuration.py:63
+msgid "the port to use on your mail server"
+msgstr "den Versandport deines Mailservers"
+
+#: configuration.py:64
+msgid "if your mail server requires authentication"
+msgstr "ob dein Mailserver eine Authentifizierung voraussetzt"
+
+#: configuration.py:65
+msgid "the user name used to authenticate to your mail server"
+msgstr "den Benutzernamen für die Authentifizierung am Mailserver"
+
+#: configuration.py:66
+msgid "the password used to authenticate to your mail server"
+msgstr "das für die Authentifizierung am Mailserver zu nutzende Passwort"
+
+#: configuration.py:67
+msgid "the path to your youtube-dl installation"
+msgstr "der Pfad zu deiner youtube-dl-Installation"
+
+#: configuration.py:68
+msgid "if you want to be notified via e-mail about new videos"
+msgstr "ob du über neue Videos per E-Mail benachrichtigt werden möchtest"
+
+#: configuration.py:69
+msgid "which video codec you prefer (h264, webm or flv)"
+msgstr ""
+
+#: configuration.py:70
+msgid "which resolution you prefer (360p, 480p, 720p or 1080p)"
+msgstr ""
+
+#: configuration.py:83
+msgid "Opening configuration file"
+msgstr ""
+
+#: configuration.py:87
 msgid "Configuration could not be written, please check that the configuration directory exists and is writable"
 msgstr ""
 
-#: configuration.py:68
+#: configuration.py:92
+msgid "Writing value for %s"
+msgstr ""
+
+#: configuration.py:102
 msgid "The database could not be created, please check that the configuration directory exists and is writable"
 msgstr ""
 
-#: configuration.py:99
+#: configuration.py:107
+msgid "Creating table subscriptions"
+msgstr ""
+
+#: configuration.py:117
+msgid "Creating table videos"
+msgstr ""
+
+#: configuration.py:137
+msgid "Creating hidden directory in home for configuration and database"
+msgstr ""
+
+#: configuration.py:142
 msgid "Configuration directory could not be created, please check that your home directory exists and is writable"
 msgstr ""
 
-#: configuration.py:115
+#: configuration.py:146
+msgid "Looking for youtube-dl file"
+msgstr ""
+
+#: configuration.py:159
+msgid "Opening config file for reading"
+msgstr ""
+
+#: configuration.py:163
 msgid "Configuration could not be read, please check that the configuration file exists and is readable"
 msgstr ""
 
-#: configuration.py:132 configuration.py:153
+#: configuration.py:167
+msgid "Reading line %s"
+msgstr ""
+
+#: configuration.py:180
+msgid "Checking current and running configuration version"
+msgstr ""
+
+#: configuration.py:185
 msgid "Invalid config version read"
 msgstr ""
 
-#: stov.py:49
+#: configuration.py:190
+msgid "Found running version: "
+msgstr ""
+
+#: configuration.py:191 configuration.py:215
+msgid "Current version: "
+msgstr ""
+
+#: configuration.py:210
+msgid "Checking current and running database version."
+msgstr ""
+
+#: configuration.py:214
+msgid "Found running database version: "
+msgstr ""
+
+#: configuration.py:232
+msgid "The database could not be updated, please check that the configuration directory exists and is writable"
+msgstr ""
+
+#: configuration.py:252
+msgid "Trying to determine the itag value for youtube-dl from your quality and codec settings"
+msgstr ""
+
+#: configuration.py:283
+msgid "Found value: %s"
+msgstr ""
+
+#: configuration.py:290
+msgid ""
+"This assistant will help you to perform the initial configuration of stov. \n"
+"The default value will be displayed in brackets.\n"
+"Please specify now :\n"
+msgstr ""
+
+#: configuration.py:303
+msgid "Writing initial configuration according to your input, have fun!"
+msgstr ""
+
+#: stov.py:51
 msgid "Translation files could not be found, localization won't be available"
 msgstr ""
 
-#: stov.py:90
+#: stov.py:66
+msgid "option %s requires an integer value"
+msgstr ""
+
+#: stov.py:71
+msgid "option %s requires an argument"
+msgstr ""
+
+#: stov.py:75
+msgid "invalid option %s"
+msgstr ""
+
+#: stov.py:100
 msgid "Usage: %prog [options]"
 msgstr ""
 
-#: stov.py:94
+#: stov.py:104
 msgid "Add a new subscription (requires either --search, --channel or --playlist)"
 msgstr ""
 
-#: stov.py:97
+#: stov.py:107
 msgid "Add a new Playlist subscription (requires add)"
 msgstr ""
 
-#: stov.py:99
+#: stov.py:109
 msgid "List the currently available subscriptions"
 msgstr ""
 
-#: stov.py:101
+#: stov.py:111
 msgid "remove a subscription"
 msgstr ""
 
-#: stov.py:103
+#: stov.py:113
 msgid "update the information about the available videos"
 msgstr ""
 
-#: stov.py:105
+#: stov.py:115
 msgid "download all available videos which haven't already been downloaded"
 msgstr ""
 
-#: stov.py:107
+#: stov.py:117
 msgid "optionally add a search string to a new channel subscription or create a new search subscription (requires --add)"
 msgstr ""
 
-#: stov.py:110
+#: stov.py:120
 msgid "Print all videos from a subscription"
 msgstr ""
 
-#: stov.py:112
+#: stov.py:122
 msgid "Mark all videos from one channel as read (requires subscription-id as argument)"
 msgstr ""
 
-#: stov.py:115
+#: stov.py:125
 msgid "specify a channel for a new subscription (requires --add)"
 msgstr ""
 
-#: stov.py:117
+#: stov.py:127
 msgid "show the license of the program"
 msgstr ""
 
-#: stov.py:119
+#: stov.py:129
 msgid "show the current running version number"
 msgstr ""
 
-#: stov.py:128
-msgid "This file should not be imported as a module please run it directly from command line"
+#: stov.py:131
+msgid "Suppress all output"
+msgstr ""
+
+#: stov.py:133
+msgid "Be verbose and print also diagnostical messages"
 msgstr ""
 
-#: stov.py:143
+#: stov.py:135
+msgid "Clean the database of entries no longer listed in the current API response"
+msgstr ""
+
+#: stov.py:156
+msgid "--quiet and --verbose can't be defined at the same time, exiting."
+msgstr ""
+
+#: stov.py:176
 msgid "Lock file could not be opened, please check that it exists and is readable, quitting now"
 msgstr ""
 
-#: stov.py:148
+#: stov.py:182
 msgid ""
 "The lock file already exists, probably anotherinstance of this program is already running\n"
-"if you are sure this is not the case, delete itmanually and try again!"
+"if you are sure this is not the case, delete it manually and try again!"
 msgstr ""
 
-#: stov.py:158
+#: stov.py:193
 msgid "Old lock file could not be deleted!"
 msgstr ""
 
-#: stov.py:164
+#: stov.py:200
 msgid "Lock file could not be created, please check that /tmp is writable and properly configured, quitting now"
 msgstr ""
 
-#: stov.py:173
-msgid "This seems to be the first time you run the programm, it will now create the default configuration for you"
+#: stov.py:210
+msgid "This seems to be the first time you run the programm, do you want to run the interactive assistant? (yes/no)"
 msgstr ""
 
-#: stov.py:180
+#: stov.py:218
+msgid "Writing initial configuration according to default values"
+msgstr ""
+
+#: stov.py:224
 msgid "Your configuration needs to be updated, performing update now."
 msgstr ""
 
-#: stov.py:184
+#: stov.py:229
 msgid "Your database needs to be updated, performing update now."
 msgstr ""
 
-#: stov.py:198
+#: stov.py:251
 msgid "Found youtube-dl, writing to configuration file."
 msgstr ""
 
-#: stov.py:201
+#: stov.py:255
 msgid "Could not find youtube-dl, it either does not exist, is not readable or not executable. Please note that youtube-dl is not needed for the program to run but is needed to use the download option which won't work otherwise. If youtube-dl isn't found automatically, you may also enter the path to it in the configuration file."
 msgstr ""
 
-#: stov.py:225
+#: stov.py:280
 msgid "Search_"
 msgstr ""
 
-#: stov.py:228
+#: stov.py:283
 msgid "Playlists do not support searching, search option will be ignored!"
 msgstr ""
 
-#: stov.py:235
+#: stov.py:289
 msgid "No valid subscription options given, subscription could not be added"
 msgstr ""
 
-#: stov.py:241
+#: stov.py:296
 msgid "New subscription "
 msgstr ""
 
-#: stov.py:242
+#: stov.py:297
 msgid " successfully added"
 msgstr ""
 
-#: stov.py:248 stov.py:277 stov.py:364
+#: stov.py:304 stov.py:338 stov.py:479 stov.py:503 stov.py:521
 msgid "Could not access the database, please check path and permissions and try again!"
 msgstr ""
 
-#: stov.py:255
+#: stov.py:312
 msgid "ID Title"
 msgstr ""
 
-#: stov.py:260
+#: stov.py:319
 msgid "No subscriptions added yet, add one!"
 msgstr ""
 
-#: stov.py:268
+#: stov.py:328
 msgid "Invalid Option, please use the ID of the subscriptionyou want to delete as parameter for the remove option"
 msgstr ""
 
-#: stov.py:296
+#: stov.py:358
 msgid "Could not access the database, please check pathand permissions and try again!"
 msgstr ""
 
-#: stov.py:318
+#: stov.py:367
+msgid "Codec and resolution could not be determined, using maximum possible value"
+msgstr ""
+
+#: stov.py:388
 msgid "Downloaded %i new video"
-msgstr "%i neues Video heruntergeladen"
+msgstr ""
 
-#: stov.py:319
+#: stov.py:389
 msgid ""
 "The following episode has been downloaded by stov: \n"
 "\n"
-msgstr "stov hat folgende neue Folge heruntergeladen: \n"
-"\n"
+msgstr ""
 
-#: stov.py:321
+#: stov.py:391
 msgid "Downloaded %i new videos"
-msgstr "%i neue Videos heruntergeladen"
+msgstr ""
 
-#: stov.py:322
+#: stov.py:392
 msgid ""
 "The following episodes have been downloaded by stov: \n"
 "\n"
-msgstr "stov hat folgende neuen Folgen heruntergeladen: \n"
-"\n"
+msgstr ""
 
-#: stov.py:333
+#: stov.py:403
 msgid "Could not connect to the smtp server, please check your settings!"
 msgstr ""
 
-#: stov.py:343
+#: stov.py:409
+msgid "TLS not available, proceeding unencrypted"
+msgstr ""
+
+#: stov.py:415
+msgid "Authentication failed, please check user nameand password!"
+msgstr ""
+
+#: stov.py:419
+msgid "Could not authenticate, server probably does not support authentication!"
+msgstr ""
+
+#: stov.py:426
+msgid "The server refused the recipient address, please check your settings"
+msgstr ""
+
+#: stov.py:430
+msgid "The server refused the sender address, please check your settings"
+msgstr ""
+
+#: stov.py:436
+msgid "No videos to be downloaded."
+msgstr ""
+
+#: stov.py:440
+msgid ""
+"The following videos have been downloaded:\n"
+msgstr ""
+
+#: stov.py:446
+msgid "Could not determine how you want to be informed about new videos, please check the notify parameter in your configuration"
+msgstr ""
+
+#: stov.py:456
 msgid "Could not access the database, please checkpath and permissions and try again!"
 msgstr ""
 
-#: stov.py:358
+#: stov.py:472
 msgid "Invalid subscription, please check the list and try again"
 msgstr ""
 
-#: stov.py:376
+#: stov.py:492
 msgid "Subscription could not be updated, please check if the ID given is correct"
 msgstr ""
 
-#: stov.py:405
+#: stov.py:554
 msgid "Could not delete the lock file. Please check what went wrong and clean up manually!"
 msgstr ""
 
-#: subscription.py:56
+#: subscription.py:58
 msgid "Could not write to database, subscription was NOT deleted. Please check permissions and try again."
 msgstr ""
 
-#: subscription.py:66
+#: subscription.py:69
 msgid "Subscription deleted successfully!"
 msgstr ""
 
-#: subscription.py:80
+#: subscription.py:84
 msgid "Could not write to database, new video was NOT added! Please check permissions and try again."
 msgstr ""
 
-#: subscription.py:109
+#: subscription.py:89
+msgid "Checking if video \"%s\" exists in the database"
+msgstr ""
+
+#: subscription.py:96
+msgid "Video %s not found in database, inserting..."
+msgstr ""
+
+#: subscription.py:117
 msgid "Could not access database. Please check permissions and try again."
 msgstr ""
 
-#: subscription.py:135
+#: subscription.py:121
+msgid "Getting all videos for subscription %s from database"
+msgstr ""
+
+#: subscription.py:129
+msgid "Got video %s"
+msgstr ""
+
+#: subscription.py:152
 msgid "Videos in subscription "
 msgstr ""
 
-#: subscription.py:145
+#: subscription.py:156
+msgid "   (pending)"
+msgstr ""
+
+#: subscription.py:159
+msgid "   (downloaded)"
+msgstr ""
+
+#: subscription.py:162
+msgid "   (failed)"
+msgstr ""
+
+#: subscription.py:171
 msgid "Could not write to database, new subscription was NOT added! Please check permissions and try again."
 msgstr ""
 
-#: subscription.py:173
+#: subscription.py:177
+msgid "Found subscription title %s"
+msgstr ""
+
+#: subscription.py:180
+msgid "Directory: %s"
+msgstr ""
+
+#: subscription.py:186
+msgid "Writing subscription info into database..."
+msgstr ""
+
+#: subscription.py:196
+msgid "Subscription got internal ID %s"
+msgstr ""
+
+#: subscription.py:206
+msgid "Connectiong to youtube API."
+msgstr ""
+
+#: subscription.py:209
+msgid "Connection established, reading data."
+msgstr ""
+
+#: subscription.py:214
 msgid "Could not get API data, maybe the API is down or you have given wrong parameters, please check and try again!"
 msgstr ""
 
-#: subscription.py:194
+#: subscription.py:220
+msgid "Parsing youtube API response."
+msgstr ""
+
+#: subscription.py:243
 msgid "None or invalid subscription type given, please check the type option and try again"
 msgstr ""
 
-#: youtube.py:42
+#: subscription.py:246
+msgid "Constructed the following API URL: %s"
+msgstr ""
+
+#: subscription.py:262
+msgid "Video %s deleted from the database!"
+msgstr ""
+
+#: subscription.py:266
+msgid "Videos %s could not be deleted from the database"
+msgstr ""
+
+#: youtube.py:44
+msgid "Creating directory %s"
+msgstr ""
+
+#: youtube.py:48
 msgid "Download directory does not exist and can't be created. Please check your configuration and try again"
 msgstr ""
 
-#: youtube.py:65
+#: youtube.py:55
+msgid "Downloading video \"%s\""
+msgstr ""
+
+#: youtube.py:72
+msgid "The Video \"%s\" has been downloaded but the status could not be updated in the database. Please check what went wrong and correct it"
+msgstr ""
+
+#: youtube.py:79
+msgid "Downloaded video \"%s\", updating database accordingly."
+msgstr ""
+
+#: youtube.py:88
 msgid "The video %s could not be downloaded due to some problem with youtube-dl. If this happens to more than one video, please check your youtube-dl version"
 msgstr ""
 
+#: youtube.py:95
+msgid "The Video \"%s\" has failed downloading but the status could not be updated in the database. Please check what went wrong and correct it"
+msgstr ""
+
+#: youtube.py:104
+msgid "The video \"%s\" has failed downloading too often, marking as failed"
+msgstr ""
+
+#: youtube.py:124
+msgid "Could not connect to the database, please check settings and permissions and try again"
+msgstr ""
+

messages.pot

@@ -1,17 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# GNU gettext file for stov
+# Helmut Pozimski <helmut@pozimski.eu>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 0.3\n"
 "POT-Creation-Date: 2012-12-27 22:18+CET\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"
+"PO-Revision-Date: 2012-12-27 22:27+CET\n"
+"Last-Translator: Helmut Pozimski <helmut@pozimski.eu>\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"