updated gettext files and the German translation accordingly

TODO

@@ -1,9 +1,6 @@
 TODOs for 1.0:
 
 * Reintroduce some of the removed debug output
-* Test the whole code again
-* Update German translation
 * Remove python 2 compatibility code, support python 3 only
-* Implement youtube-dl as alternative mode to API version 2
 * Check with pep8 and pylinth to do coding style improvements before the next release
 * Update man page

lib_stov/configuration.py

@@ -80,7 +80,8 @@ class conf(object):
             "maxresolution": _("which resolution you prefer (360p, 480p, 720p "
                                "or 1080p)"),
             "check_title": _("if you want to compare the title of a video "
-                             "with the subscription search string")
+                             "with the subscription search string"),
+            "use_api":  _("if you want to use the youtube API")
         }
         self.dbpath = str(os.environ['HOME']) + "/.stov/" + \
             self.values["database"]

lib_stov/noapi.py

@@ -67,7 +67,7 @@ class Connector(object):
                 self._title = item.text_content().strip().replace("\n", "")
             i += 1
         if self._search != "" and self._type == "channel":
-            self._title += " search %s" % self._search
+            self._title += _(" search %s") % self._search
 
     def _fetch_videos(self):
         """Retrieves all the relevant videos in a subscription."""

locale/de/LC_MESSAGES/stov.po

@@ -3,9 +3,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.8\n"
+"Project-Id-Version: 0.9\n"
 "POT-Creation-Date: 2012-12-27 22:18+CET\n"
-"PO-Revision-Date: 2014-06-09 12:21+CEST\n"
+"PO-Revision-Date: 2014-12-26 11:48+CET\n"
 "Last-Translator: Helmut Pozimski <helmut@pozimski.eu>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -74,6 +74,10 @@ msgstr "welche Auflösung du bevorzugst (360p, 480p, 720p oder 1080p)"
 msgid "if you want to compare the title of a video with the subscription search string"
 msgstr "ob der Titel jedes Videos mit dem Suchstring des entsprechenden Abonnements verglichen werden soll"
 
+#: lib_stov/configuration.py:84
+msgid "if you want to use the youtube API"
+msgstr "ob die Youtube API verwendet werden soll"
+
 #: lib_stov/configuration.py:216
 msgid ""
 "This assistant will help you to perform the initial configuration of stov. \n"
@@ -84,6 +88,10 @@ msgstr ""
 "Der jeweilige Standardwert wird in eckigen Klammern angegeben.\n"
 "Bitte spezifiziere jetzt :\n"
 
+#: lib_stov/noapi.py:70
+msgid " search %s"
+msgstr " Suche %s"
+
 #: lib_stov/stov_exceptions.py:28
 msgid "Could not access the database, please check path and permissions and try again!"
 msgstr "Konnte nicht auf die Datenbank zugreifen, überprüfe bitte den Pfad und die Dateiberechtigungen und versuche es erneut!"
@@ -128,6 +136,14 @@ msgstr "Das Abonnement %s ist deaktiviert, Videos werden nicht heruntergeladen."
 msgid "The download directory does not exist and can't be created. Please check your configuration and try again."
 msgstr "Das Download-Verzeichnis existiert nicht und kann nicht erstellt werden. Bitte überprüfe die Konfiguration und versuche es erneut."
 
+#: lib_stov/stov_exceptions.py:174
+msgid "The migration of the configuration to the json format failed."
+msgstr "Die Migration der Konfiguration ins json-Format ist fehlgeschlagen."
+
+#: lib_stov/stov_exceptions.py:185
+msgid "Execution of youtube-dl failed."
+msgstr "Es ist ein Fehler bei der Ausführung von youtube-dl aufgetreten."
+
 #: lib_stov/subscription.py:122
 msgid "   (pending)"
 msgstr "    (wartet)"
@@ -284,6 +300,10 @@ msgstr "Erstelle das versteckte Verzeichnis im Home-Verzeichnis für die Konfigu
 msgid "Comparing current and running configuration version."
 msgstr "Vergleiche die aktuelle und die laufende Version der Konfiguration."
 
+#: stov:291
+msgid "Migrating configuration from plain text to json."
+msgstr "Die Konfiguration wird nun ins json-Format konvertiert."
+
 #: stov:301
 msgid "Your configuration needs to be updated, performing update now."
 msgstr "Die Konfiguration muss aktualisiert werden, die Aktualisierung wird jetzt vorgenommen."

locale/en/LC_MESSAGES/stov.po

@@ -3,9 +3,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.8\n"
+"Project-Id-Version: 0.9\n"
 "POT-Creation-Date: 2012-12-27 22:18+CET\n"
-"PO-Revision-Date: 2014-06-09 12:21+CEST\n"
+"PO-Revision-Date: 2014-12-26 11:40+CET\n"
 "Last-Translator: Helmut Pozimski <helmut@pozimski.eu>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -13,73 +13,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: lib_stov/configuration.py:59
+
+#: lib_stov/configuration.py:61
 msgid "the name of your database file"
 msgstr ""
 
-#: lib_stov/configuration.py:60
+#: lib_stov/configuration.py:62
 msgid "the directory where downloaded videos are saved"
 msgstr ""
 
-#: lib_stov/configuration.py:62
+#: lib_stov/configuration.py:64
 msgid "the maximum number of videos to retrieve for each subscription"
 msgstr ""
 
-#: lib_stov/configuration.py:64
+#: lib_stov/configuration.py:66
 msgid "the host name of your mail server"
 msgstr ""
 
-#: lib_stov/configuration.py:65
+#: lib_stov/configuration.py:67
 msgid "the address used for notifications"
 msgstr ""
 
-#: lib_stov/configuration.py:66
+#: lib_stov/configuration.py:68
 msgid "the sender address of notification e-mails"
 msgstr ""
 
-#: lib_stov/configuration.py:67
+#: lib_stov/configuration.py:69
 msgid "the port to use on your mail server"
 msgstr ""
 
-#: lib_stov/configuration.py:68
+#: lib_stov/configuration.py:70
 msgid "if your mail server requires authentication"
 msgstr ""
 
-#: lib_stov/configuration.py:69
+#: lib_stov/configuration.py:71
 msgid "the user name used to authenticate to your mail server"
 msgstr ""
 
-#: lib_stov/configuration.py:71
+#: lib_stov/configuration.py:73
 msgid "the password used to authenticate to your mail server"
 msgstr ""
 
-#: lib_stov/configuration.py:73
+#: lib_stov/configuration.py:75
 msgid "the path to your youtube-dl installation"
 msgstr ""
 
-#: lib_stov/configuration.py:74
+#: lib_stov/configuration.py:76
 msgid "if you want to be notified via e-mail about new videos"
 msgstr ""
 
-#: lib_stov/configuration.py:76
+#: lib_stov/configuration.py:78
 msgid "which video codec you prefer (h264, webm or flv)"
 msgstr ""
 
-#: lib_stov/configuration.py:78
+#: lib_stov/configuration.py:80
 msgid "which resolution you prefer (360p, 480p, 720p or 1080p)"
 msgstr ""
 
-#: lib_stov/configuration.py:80
+#: lib_stov/configuration.py:82
 msgid "if you want to compare the title of a video with the subscription search string"
 msgstr ""
 
-#: lib_stov/configuration.py:216
+#: lib_stov/configuration.py:84
+msgid "if you want to use the youtube API"
+msgstr ""
+
+#: lib_stov/configuration.py:231
 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 ""
 
+#: lib_stov/noapi.py:70
+msgid " search %s"
+msgstr ""
+
 #: lib_stov/stov_exceptions.py:28
 msgid "Could not access the database, please check path and permissions and try again!"
 msgstr ""
@@ -124,15 +133,23 @@ msgstr ""
 msgid "The download directory does not exist and can't be created. Please check your configuration and try again."
 msgstr ""
 
-#: lib_stov/subscription.py:122
+#: lib_stov/stov_exceptions.py:174
+msgid "The migration of the configuration to the json format failed."
+msgstr ""
+
+#: lib_stov/stov_exceptions.py:185
+msgid "Execution of youtube-dl failed."
+msgstr ""
+
+#: lib_stov/subscription.py:114
 msgid "   (pending)"
 msgstr ""
 
-#: lib_stov/subscription.py:124
+#: lib_stov/subscription.py:116
 msgid "   (downloaded)"
 msgstr ""
 
-#: lib_stov/subscription.py:126
+#: lib_stov/subscription.py:118
 msgid "   (failed)"
 msgstr ""
 
@@ -275,187 +292,191 @@ msgid "Creating hidden directory in home for configuration and database."
 msgstr ""
 
 #: stov:291
+msgid "Migrating configuration from plain text to json."
+msgstr ""
+
+#: stov:294
 msgid "Comparing current and running configuration version."
 msgstr ""
 
-#: stov:301
+#: stov:304
 msgid "Your configuration needs to be updated, performing update now."
 msgstr ""
 
-#: stov:334
+#: stov:337
 msgid "Created initial database tables."
 msgstr ""
 
-#: stov:337
+#: stov:340
 msgid "Comparing current and running database version."
 msgstr ""
 
-#: stov:339
+#: stov:342
 msgid "Your database needs to be updated, performing update now."
 msgstr ""
 
-#: stov:369
+#: stov:372
 msgid "Found youtube-dl, writing it's path to the configuration file."
 msgstr ""
 
-#: stov:378
+#: stov:381
 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:404
+#: stov:407
 msgid "Search_"
 msgstr ""
 
-#: stov:409
+#: stov:412
 msgid "Playlists do not support searching, the search option will be ignored!"
 msgstr ""
 
-#: stov:415
+#: stov:418
 msgid "None or invalid subscription type given, please check the type option and try again."
 msgstr ""
 
-#: stov:425
+#: stov:428
 msgid "Subscription sucessfully inserted into database."
 msgstr ""
 
-#: stov:441 stov:507
+#: stov:444 stov:499
 msgid "Video %s successfully inserted into database."
 msgstr ""
 
-#: stov:443
+#: stov:446
 msgid "New subscription "
 msgstr ""
 
-#: stov:444
+#: stov:447
 msgid " successfully added"
 msgstr ""
 
-#: stov:450
+#: stov:453
 msgid "ID Title"
 msgstr ""
 
-#: stov:453
+#: stov:456
 msgid "enabled"
 msgstr ""
 
-#: stov:455
+#: stov:458
 msgid "disabled"
 msgstr ""
 
-#: stov:460
+#: stov:462
 msgid "No subscriptions added yet, add one!"
 msgstr ""
 
-#: stov:465
+#: stov:467
 msgid "Invalid option, please use the ID of the subscription you want to delete as parameter for the remove option."
 msgstr ""
 
-#: stov:478
+#: stov:480
 msgid "Subscription deleted successfully!"
 msgstr ""
 
-#: stov:513
+#: stov:504
 msgid "Trying to determine the itag value for youtube-dl from your quality and codec settings."
 msgstr ""
 
-#: stov:516
+#: stov:507
 msgid "Found value: %s."
 msgstr ""
 
-#: stov:518
+#: stov:509
 msgid "Codec and resolution could not be determined, using maximum possible value."
 msgstr ""
 
-#: stov:556
+#: stov:538
 msgid "Downloaded %i new video"
 msgstr ""
 
-#: stov:557
+#: stov:539
 msgid ""
 "The following episode has been downloaded by stov: \n"
 "\n"
 msgstr ""
 
-#: stov:560
+#: stov:542
 msgid "Downloaded %i new videos"
 msgstr ""
 
-#: stov:561
+#: stov:543
 msgid ""
 "The following episodes have been downloaded by stov: \n"
 "\n"
 msgstr ""
 
-#: stov:579
+#: stov:561
 msgid "Could not connect to the smtp server, please check your settings!"
 msgstr ""
 
-#: stov:586
+#: stov:568
 msgid "TLS not available, proceeding unencrypted."
 msgstr ""
 
-#: stov:592
+#: stov:574
 msgid "Authentication failed, please check user name and password!"
 msgstr ""
 
-#: stov:595
+#: stov:577
 msgid "Could not authenticate, server probably does not support authentication!"
 msgstr ""
 
-#: stov:602
+#: stov:584
 msgid "The server refused the recipient address, please check your settings."
 msgstr ""
 
-#: stov:605
+#: stov:587
 msgid "The server refused the sender address, please check your settings."
 msgstr ""
 
-#: stov:610
+#: stov:592
 msgid "There are no videos to be downloaded."
 msgstr ""
 
-#: stov:613
+#: stov:595
 msgid ""
 "The following videos have been downloaded:\n"
 msgstr ""
 
-#: stov:618
+#: stov:600
 msgid "Could not determine how you want to be informed about new videos, please check the notify parameter in your configuration."
 msgstr ""
 
-#: stov:641
+#: stov:623
 msgid "Invalid subscription, please check the list and try again."
 msgstr ""
 
-#: stov:656
+#: stov:638
 msgid "The subscription could not be updated, please check if the ID given is correct."
 msgstr ""
 
-#: stov:673
+#: stov:648
 msgid "Deleting video %s from database"
 msgstr ""
 
-#: stov:689
+#: stov:664
 msgid "The subscription ID %s is already enabled."
 msgstr ""
 
-#: stov:698
+#: stov:673
 msgid "Enabled subscription ID %s."
 msgstr ""
 
-#: stov:701 stov:719
+#: stov:676 stov:694
 msgid "Could not find the subscription with ID %s, please check and try again."
 msgstr ""
 
-#: stov:707
+#: stov:682
 msgid "Subscription ID %s is already disabled."
 msgstr ""
 
-#: stov:716
+#: stov:691
 msgid "Disabled subscription ID %s."
 msgstr ""
 
-#: stov:748
+#: stov:723
 msgid "Could not delete the lock file. Please check what went wrong and clean up manually!"
 msgstr ""