Minor changes in error handling and translations.

diff --git a/lib/pp_admintools/app/pdns.py b/lib/pp_admintools/app/pdns.py
index abcadceefcbcb48813d59ff1e90a11bb5c53932f..641f7f54b15a65771499958bd2c400c0cfd91b8a 100644 (file)
--- a/lib/pp_admintools/app/pdns.py
+++ b/lib/pp_admintools/app/pdns.py
@@ -30,7 +30,7 @@ from fb_tools.xlate import format_list
 
 import psutil
 
-import requests
+from requests import ConnectionError, ReadTimeout, ConnectTimeout
 
 # Own modules
 from .mail import BaseMailApplication, MailAppError
@@ -41,7 +41,7 @@ from ..config.pdns import PdnsConfiguration
 # from ..config.pdns import PdnsConfigError, PdnsConfiguration
 from ..xlate import XLATOR
 
-__version__ = '0.9.13'
+__version__ = '0.10.0'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -414,7 +414,7 @@ class PpPDNSApplication(BaseMailApplication):
     # -------------------------------------------------------------------------
     def post_run(self):
         """
-        Execute this cwafterbefore the main routine.
+        Execute this after the main routine.
 
         Could be overwritten by descendant classes.
         """
@@ -435,7 +435,7 @@ class PpPDNSApplication(BaseMailApplication):
 
             return self.pdns.get_api_server_version()
 
-        except (requests.ConnectionError, requests.ReadTimeout, requests.ConnectTimeout) as e:
+        except (ConnectionError, ReadTimeout, ConnectTimeout, PowerDNSHandlerError) as e:
             msg = _('Got a {} during evaluating the PDNS server version from API:').format(
                 e.__class__.__name__)
             msg += ' ' + str(e)

diff --git a/locale/de_DE/LC_MESSAGES/pp_admintools.po b/locale/de_DE/LC_MESSAGES/pp_admintools.po
index 90817e74cdbe4df0e5f447be4ddefd78b14a75a8..a8e4d684859119257eb9a1ae512d59c01c1740fa 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/pp_admintools.po
+++ b/locale/de_DE/LC_MESSAGES/pp_admintools.po
@@ -1944,7 +1944,7 @@ msgstr "Das PDNS-Server-Objekt ist nicht initialisiert."
 
 #: lib/pp_admintools/app/pdns.py:439
 msgid "Got a {} during evaluating the PDNS server version from API:"
-msgstr "Habe in {} bei der Ermittlung der PowerDNS-Serverversion erhalten:"
+msgstr "Habe {} bei der Ermittlung der PowerDNS-Serverversion erhalten:"
 
 #: lib/pp_admintools/app/pdns.py:494
 msgid "Trying to get complete information about zone {!r} ..."