Updating Debug output and translations

diff --git a/lib/pp_admintools/app/barracuda_sync.py b/lib/pp_admintools/app/barracuda_sync.py
index b787849dc88523d74fa62f46837a811f2a3c99b5..b1ee14b33cc81c72d8dc0e05ce048787c4c14ad7 100644 (file)
--- a/lib/pp_admintools/app/barracuda_sync.py
+++ b/lib/pp_admintools/app/barracuda_sync.py
@@ -31,7 +31,7 @@ from ldap3 import MODIFY_ADD, MODIFY_DELETE, MODIFY_REPLACE
 from .ldap import BaseLdapApplication
 from ..xlate import XLATOR
 
-__version__ = '0.9.9'
+__version__ = '1.0.0'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -393,7 +393,7 @@ class BarracudaSyncApp(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def read_virtual_alias_mappings(self):
         """Read all virtual alias mappings."""
-        LOG.info(_('Reading in all virtual alias mappings ...'))
+        LOG.debug(_('Reading in all virtual alias mappings ...'))
 
         self.existing_aliases = {}
 
@@ -408,7 +408,7 @@ class BarracudaSyncApp(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def read_virtual_alias_mapping(self, mapping):
         """Read virtual aliases from mappping."""
-        LOG.info(_('Reading in from virtual alias mapping {!r} ...').format(str(mapping)))
+        LOG.debug(_('Reading in from virtual alias mapping {!r} ...').format(str(mapping)))
 
         handler = BaseHandler(appname=self.appname, verbose=self.verbose)
         pdata = handler.call([str(self.postmap_command), '-s', mapping], quiet=True)
@@ -452,7 +452,7 @@ class BarracudaSyncApp(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def verify_barracuda_container(self):
         """Verify existence of the LDAP container (OU) of the alias definitions for Barracuda."""
-        LOG.info(_('Verifying existence of the LDAP container (OU) {!r} for Barracuda.').format(
+        LOG.debug(_('Verifying existence of the LDAP container (OU) {!r} for Barracuda.').format(
             self.barracuda_base_dn))
 
         inst = self.ldap_instances[0]
@@ -474,7 +474,7 @@ class BarracudaSyncApp(BaseLdapApplication):
         msg = _(
             'Read all virtual aliases in LDAP below the Barracuda container {!r} ...').format(
             self.barracuda_base_dn)
-        LOG.info(msg)
+        LOG.debug(msg)
 
         inst = self.ldap_instances[0]
         ldap_filter = '(&(objectclass=mailRecipient)(mail=*))'
@@ -492,7 +492,7 @@ class BarracudaSyncApp(BaseLdapApplication):
     def get_other_ldap_mail_entries(self):
         """Get all LDAP entries except for Barracuda, where mail attributes are set."""
         msg = _('Get all LDAP entries except for Barracuda, where mail attributes are set.')
-        LOG.info(msg)
+        LOG.debug(msg)
 
         self.ldap_mail_dns = {}
 
@@ -851,20 +851,21 @@ class BarracudaSyncApp(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def remove_old_alias_entries(self):
         """Remove all no more used alias entries."""
-        self.empty_line()
-        LOG.info(_('Removing all no more used alias entries ...'))
-        inst = self.ldap_instances[0]
-
         nr_aliases = len(self.aliases_to_remove)
-        i = 0
 
         if not nr_aliases:
-            msg = _('No aliases found to remove in LDAP.')
-            LOG.info(msg)
-            if self.wait_interval:
-                time.sleep(self.wait_interval * 10)
+            if self.verbose:
+                msg = _('No aliases found to remove in LDAP.')
+                LOG.info(msg)
+                if self.wait_interval:
+                    time.sleep(self.wait_interval * 10)
             return
 
+        self.empty_line()
+        LOG.info(_('Removing all no more used alias entries ...'))
+        inst = self.ldap_instances[0]
+        i = 0
+
         try:
             for dn in self.aliases_to_remove:
                 self.delete_entry(inst, dn)
@@ -884,20 +885,21 @@ class BarracudaSyncApp(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def add_failing_ldap_entries(self):
         """Create failing LDAP entries."""
-        self.empty_line()
-        LOG.info(_('Adding failing LDAP aliases ...'))
-        inst = self.ldap_instances[0]
-
         nr_aliases = len(self.aliases_to_create)
-        i = 0
 
         if not nr_aliases:
-            msg = _('No aliases found to create in LDAP.')
-            LOG.info(msg)
-            if self.wait_interval:
-                time.sleep(self.wait_interval * 10)
+            if self.verbose:
+                msg = _('No aliases found to create in LDAP.')
+                LOG.info(msg)
+                if self.wait_interval:
+                    time.sleep(self.wait_interval * 10)
             return
 
+        self.empty_line()
+        LOG.info(_('Adding failing LDAP aliases ...'))
+        inst = self.ldap_instances[0]
+        i = 0
+
         try:
             for cn in self.aliases_to_create:
                 dn = 'cn=' + cn + ',' + self.barracuda_base_dn
@@ -920,20 +922,21 @@ class BarracudaSyncApp(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def modify_existing_entries(self):
         """Modify existing LDAP entries below the Barracuda container."""
-        self.empty_line()
-        LOG.info(_('Modifying existing alias entries ...'))
-        inst = self.ldap_instances[0]
-
         nr_aliases = len(self.aliases_to_modify.keys())
-        i = 0
 
         if not nr_aliases:
-            msg = _('No aliases found to mofify in LDAP.')
-            LOG.info(msg)
-            if self.wait_interval:
-                time.sleep(self.wait_interval * 10)
+            if self.verbose:
+               msg = _('No aliases found to mofify in LDAP.')
+               LOG.info(msg)
+               if self.wait_interval:
+                   time.sleep(self.wait_interval * 10)
             return
 
+        self.empty_line()
+        LOG.info(_('Modifying existing alias entries ...'))
+        inst = self.ldap_instances[0]
+        i = 0
+
         try:
             for dn in sorted(self.aliases_to_modify.keys(), key=cmp_to_key(self.compare_ldap_dns)):
                 modify_data = self.aliases_to_modify[dn]
@@ -955,6 +958,7 @@ class BarracudaSyncApp(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def _run(self):
 
+        LOG.info(_("Get all necessary data from LDAP and static virtual aliases table ..."))
         self.verify_barracuda_container()
         self.read_virtual_alias_mappings()
         self.read_barracuda_ldap_aliases()

diff --git a/locale/de_DE/LC_MESSAGES/pp_admintools.po b/locale/de_DE/LC_MESSAGES/pp_admintools.po
index 3a2b9c8a4bfd54c056108fb58ba596f6483368b7..e97e55e3f6ef94a7cc3af26d5f1a6d91a8f64d3f 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/pp_admintools.po
+++ b/locale/de_DE/LC_MESSAGES/pp_admintools.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.8.8\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2023-05-26 12:48+0200\n"
-"PO-Revision-Date: 2023-05-26 12:00+0100\n"
+"POT-Creation-Date: 2023-05-31 10:50+0200\n"
+"PO-Revision-Date: 2023-05-31 10:55+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: de_DE\n"
 "Language-Team: de_DE <solution@pixelpark.com>\n"
@@ -198,7 +198,7 @@ msgstr "Fehler {rc} beim Holen der virtuellen Aliase von {va!r}"
 
 #: lib/pp_admintools/app/barracuda_sync.py:455
 msgid "Verifying existence of the LDAP container (OU) {!r} for Barracuda."
-msgstr "Überprüfe Exitenz des LDAP-Containers (OU) {!r} für Barracuda."
+msgstr "Überprüfe Existenz des LDAP-Containers (OU) {!r} für Barracuda."
 
 #: lib/pp_admintools/app/barracuda_sync.py:462
 msgid "LDAP container {c!r} for Barracuda not found in instance {i!r}."
@@ -310,57 +310,61 @@ msgstr "Änedrungen für Attribut {!r}:"
 msgid "No changes to attribute {!r}."
 msgstr "Keine Änderungen an Attribut {!r}."
 
-#: lib/pp_admintools/app/barracuda_sync.py:855
-msgid "Removing all no more used alias entries ..."
-msgstr "Löschen aller nicht mehr benötigter Alias-Einträge …"
-
-#: lib/pp_admintools/app/barracuda_sync.py:862
+#: lib/pp_admintools/app/barracuda_sync.py:858
 msgid "No aliases found to remove in LDAP."
 msgstr "Keine Aliases zum Löschen im LDAP gefunden."
 
-#: lib/pp_admintools/app/barracuda_sync.py:877
+#: lib/pp_admintools/app/barracuda_sync.py:865
+msgid "Removing all no more used alias entries ..."
+msgstr "Löschen aller nicht mehr benötigter Alias-Einträge …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:878
 msgid "One alias entry removed in LDAP."
 msgid_plural "{} alias entries removed in LDAP."
 msgstr[0] "Einen Alias-Eintrag im LDAP gelöscht."
 msgstr[1] "{} Alias-Einträge im LDAP gelöscht."
 
-#: lib/pp_admintools/app/barracuda_sync.py:888
-msgid "Adding failing LDAP aliases ..."
-msgstr "Füge fehlende LDAP-Aliase hinzu …"
-
-#: lib/pp_admintools/app/barracuda_sync.py:895
+#: lib/pp_admintools/app/barracuda_sync.py:892
 msgid "No aliases found to create in LDAP."
 msgstr "Keine Aliases zum Erstellen im LDAP gefunden."
 
-#: lib/pp_admintools/app/barracuda_sync.py:905
+#: lib/pp_admintools/app/barracuda_sync.py:899
+msgid "Adding failing LDAP aliases ..."
+msgstr "Füge fehlende LDAP-Aliase hinzu …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:907
 msgid "Creating LDAP alias {a!r} => {dn!r}."
 msgstr "Erstelle LDAP-Alias {a!r} => {dn!r}."
 
-#: lib/pp_admintools/app/barracuda_sync.py:913
+#: lib/pp_admintools/app/barracuda_sync.py:915
 msgid "One alias entry created in LDAP."
 msgid_plural "{} alias entries created in LDAP."
 msgstr[0] "Einen Alias-Eintrag im LDAP erstellt."
 msgstr[1] "{} Alias-Einträge im LDAP erstellt."
 
-#: lib/pp_admintools/app/barracuda_sync.py:924
-msgid "Modifying existing alias entries ..."
-msgstr "Ändere existierende LDAP-Aliase …"
-
-#: lib/pp_admintools/app/barracuda_sync.py:931
+#: lib/pp_admintools/app/barracuda_sync.py:929
 msgid "No aliases found to mofify in LDAP."
 msgstr "Keine Aliases zum Ändern im LDAP gefunden."
 
-#: lib/pp_admintools/app/barracuda_sync.py:940
+#: lib/pp_admintools/app/barracuda_sync.py:936
+msgid "Modifying existing alias entries ..."
+msgstr "Ändere existierende LDAP-Aliase …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:943
 msgid "Modifying LDAP alias {!r} ..."
 msgstr "Ändere LDAP-Alias {!r} …"
 
-#: lib/pp_admintools/app/barracuda_sync.py:948
+#: lib/pp_admintools/app/barracuda_sync.py:951
 msgid "One alias entry modified in LDAP."
 msgid_plural "{} alias entries modified in LDAP."
 msgstr[0] "Einen Alias-Eintrag im LDAP geändert."
 msgstr[1] "{} Alias-Einträge im LDAP geändert."
 
-#: lib/pp_admintools/app/barracuda_sync.py:968 lib/pp_admintools/app/mirror_ldap.py:317
+#: lib/pp_admintools/app/barracuda_sync.py:961
+msgid "Get all necessary data from LDAP and static virtual aliases table ..."
+msgstr "Hole alle notwendigen Daten aus dem LDAP und aus der statische Tabelle der virtuellen Aliase …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:972 lib/pp_admintools/app/mirror_ldap.py:317
 msgid "Finished."
 msgstr "Beendet."
 
@@ -793,7 +797,7 @@ msgid "Options fo LDAP connections"
 msgstr "Optionen für die LDAP-Verbindungen"
 
 #: lib/pp_admintools/app/ldap.py:335 lib/pp_admintools/app/mirror_ldap.py:244
-#: lib/pp_admintools/app/remove_ldap_user.py:280 lib/pp_admintools/app/set_ldap_password.py:492
+#: lib/pp_admintools/app/remove_ldap_user.py:283 lib/pp_admintools/app/set_ldap_password.py:492
 msgid "No"
 msgstr "Nein"
 
@@ -1025,7 +1029,7 @@ msgstr "Versuche den DN des Nutzer {u!r} als LDAP DN zu ermitteln …"
 msgid "Trying to evaluate DN of user {u!r} as a UID (Posix user name) ..."
 msgstr "Versuche den DN des Nutzer {u!r} als UID (POSIX Benutzername) zu ermitteln …"
 
-#: lib/pp_admintools/app/ldap.py:958 lib/pp_admintools/app/remove_ldap_user.py:290
+#: lib/pp_admintools/app/ldap.py:958 lib/pp_admintools/app/remove_ldap_user.py:293
 msgid "Empty user given."
 msgstr "Leere Nutzername übergeben."
 
@@ -1129,9 +1133,9 @@ msgid "Modification of {dn!r} was NOT successfull - {c}: {e}"
 msgstr "Die Änderung von {dn!r} war NICHT erfolgreich - {c}: {e}"
 
 #: lib/pp_admintools/app/ldap.py:1312 lib/pp_admintools/app/ldap.py:1331
-#: lib/pp_admintools/app/remove_ldap_user.py:417 lib/pp_admintools/app/remove_ldap_user.py:444
-#: lib/pp_admintools/app/remove_ldap_user.py:471 lib/pp_admintools/app/remove_ldap_user.py:502
-#: lib/pp_admintools/app/remove_ldap_user.py:533 lib/pp_admintools/app/set_ldap_password.py:521
+#: lib/pp_admintools/app/remove_ldap_user.py:420 lib/pp_admintools/app/remove_ldap_user.py:447
+#: lib/pp_admintools/app/remove_ldap_user.py:474 lib/pp_admintools/app/remove_ldap_user.py:505
+#: lib/pp_admintools/app/remove_ldap_user.py:536 lib/pp_admintools/app/set_ldap_password.py:521
 msgid "Changes:"
 msgstr "Änderungen:"
 
@@ -1383,7 +1387,7 @@ msgstr ""
 "Starte Spiegelung der LDAP-Instanz {src!r} ({src_url}) zur Instanz {tgt!r} ({tgt_url}) "
 "[{yes}/{no}]?"
 
-#: lib/pp_admintools/app/mirror_ldap.py:244 lib/pp_admintools/app/remove_ldap_user.py:280
+#: lib/pp_admintools/app/mirror_ldap.py:244 lib/pp_admintools/app/remove_ldap_user.py:283
 #: lib/pp_admintools/app/set_ldap_password.py:492
 msgid "yes"
 msgstr "ja"
@@ -1835,149 +1839,149 @@ msgstr ""
 msgid "No users to remove given."
 msgstr "Kein Nutzername zum Löschen angegeben."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:174
+#: lib/pp_admintools/app/remove_ldap_user.py:177
 msgid "Checking given instances for admin and read/write access."
 msgstr "Überprüfe die gegebenen Instanzen nach Admin- und Schreib-/Lesezugriffsrechten."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:181
+#: lib/pp_admintools/app/remove_ldap_user.py:184
 msgid "LDAP instance {!r} not found in configuration."
 msgstr "Die LDAP-Instanz {!r} wurde nicht in der Konfiguration gefunden."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:189
+#: lib/pp_admintools/app/remove_ldap_user.py:192
 msgid "LDAP instance {!r} has only readonly access."
 msgstr "Die LDAP-Instanz {!r} besitzt nur Lesezugriffsrechte."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:194
+#: lib/pp_admintools/app/remove_ldap_user.py:197
 msgid "No admin access to LDAP instance {!r}."
 msgstr "Keine Admin-Zugriffsrechte bei LDAP-Instanz {!r}."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:211
+#: lib/pp_admintools/app/remove_ldap_user.py:214
 msgid "All given users were not found in any LDAP instance."
 msgstr "Alle übergebenen Nutzer wurden in keiner der LDAP-Instanzen gefunden."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:216
+#: lib/pp_admintools/app/remove_ldap_user.py:219
 msgid "Evaluated DNs to remove:"
 msgstr "Zum Löschen ermittelte DNs:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:225
+#: lib/pp_admintools/app/remove_ldap_user.py:228
 msgid "Start disabling user entries in:"
 msgstr "Beginne Deaktivierung der Nutzereinträge in:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:227
+#: lib/pp_admintools/app/remove_ldap_user.py:230
 msgid "Start removing user entries in:"
 msgstr "Beginne Löschung der Nutzereinträge in:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:231
+#: lib/pp_admintools/app/remove_ldap_user.py:234
 msgid "Start disabling user entries ..."
 msgstr "Beginne Deaktivierung der Nutzereinträge …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:233
+#: lib/pp_admintools/app/remove_ldap_user.py:236
 msgid "Start removing user entries ..."
 msgstr "Beginne Löschung der Nutzereinträge …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:248
+#: lib/pp_admintools/app/remove_ldap_user.py:251
 msgid "Do you really want to deactivate the following users?"
 msgstr "Möchten Sie die folgenden Nutzer wirklich deaktivieren?"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:250
+#: lib/pp_admintools/app/remove_ldap_user.py:253
 msgid "Do you really want to remove the following users?"
 msgstr "Möchten Sie die folgenden Nutzer wirklich löschen?"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:276
+#: lib/pp_admintools/app/remove_ldap_user.py:279
 msgid "Deactivate [{yes}/{no}]?"
 msgstr "Deaktivieren [{yes}/{no}]?"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:278
+#: lib/pp_admintools/app/remove_ldap_user.py:281
 msgid "Remove [{yes}/{no}]?"
 msgstr "Löschen [{yes}/{no}]?"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:286
+#: lib/pp_admintools/app/remove_ldap_user.py:289
 msgid "Evaluating DNs of the user {!r} to remove ..."
 msgstr "Ermitteln der DNs des Nutzers {!r} zum Löschen …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:300 lib/pp_admintools/app/set_ldap_password.py:434
+#: lib/pp_admintools/app/remove_ldap_user.py:303 lib/pp_admintools/app/set_ldap_password.py:434
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr "Habe DN {dn!r} für den Nutzer {user!r} in der LDAP-Instanz {inst} ermittelt."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:307 lib/pp_admintools/app/set_ldap_password.py:439
+#: lib/pp_admintools/app/remove_ldap_user.py:310 lib/pp_admintools/app/set_ldap_password.py:439
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr "Fand {nr} Einträge für den Nutzer {u!r} in der LDAP-Instanz {i}."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:319 lib/pp_admintools/app/set_ldap_password.py:453
+#: lib/pp_admintools/app/remove_ldap_user.py:322 lib/pp_admintools/app/set_ldap_password.py:453
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr "Der Nutzer {user!r} wurde nicht in der LDAP-Instanz {inst} gefunden."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:328
+#: lib/pp_admintools/app/remove_ldap_user.py:331
 msgid "Deactivating all given users from {} ..."
 msgstr "Deaktivieren aller übergebenen Nutzer in {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:330
+#: lib/pp_admintools/app/remove_ldap_user.py:333
 msgid "Removing all given users from {} ..."
 msgstr "Lösche alle übergebenen Nutzer in {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:345
+#: lib/pp_admintools/app/remove_ldap_user.py:348
 msgid "Deactivating user {dn!r} from {inst} ..."
 msgstr "Deaktivieren von Nutzer {dn!r} in {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:348
+#: lib/pp_admintools/app/remove_ldap_user.py:351
 msgid "Removing user {dn!r} from {inst} ..."
 msgstr "Lösche Nutzer {dn!r} in {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:354
+#: lib/pp_admintools/app/remove_ldap_user.py:357
 msgid "Attributes of {!r}:"
 msgstr "Attribute von {!r}:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:375
+#: lib/pp_admintools/app/remove_ldap_user.py:378
 msgid "{c} on removing user {dn!r}: {e}"
 msgstr "{c} beim Löschen des Nutzers {dn!r}: {e}"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:381
+#: lib/pp_admintools/app/remove_ldap_user.py:384
 msgid "User {dn!r} successful deactivated on {inst}."
 msgstr "Der Nutzer {dn!r} wurde erfolgreich auf {inst} deaktiviert."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:384
+#: lib/pp_admintools/app/remove_ldap_user.py:387
 msgid "User {dn!r} successful removed from {inst}."
 msgstr "Der Nutzer {dn!r} wurde erfolgreich von {inst} gelöscht."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:410
+#: lib/pp_admintools/app/remove_ldap_user.py:413
 msgid "Updating user info for {dn!r} on {inst} ..."
 msgstr "Aktualisiere die Nutzerinformationenn für {dn!r} in {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:415 lib/pp_admintools/app/set_ldap_password.py:519
+#: lib/pp_admintools/app/remove_ldap_user.py:418 lib/pp_admintools/app/set_ldap_password.py:519
 msgid "{c} on deactivating user {dn!r}: {e}"
 msgstr "{c} beim Deaktivieren des Nutzers {dn!r}: {e}"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:431
+#: lib/pp_admintools/app/remove_ldap_user.py:434
 msgid "Did not found any group memberships of {dn!r} in {inst}."
 msgstr "Keine Gruppenmitgliedschaften von {dn!r} in {inst} gefunden."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:437 lib/pp_admintools/app/remove_ldap_user.py:464
-#: lib/pp_admintools/app/remove_ldap_user.py:495 lib/pp_admintools/app/remove_ldap_user.py:526
+#: lib/pp_admintools/app/remove_ldap_user.py:440 lib/pp_admintools/app/remove_ldap_user.py:467
+#: lib/pp_admintools/app/remove_ldap_user.py:498 lib/pp_admintools/app/remove_ldap_user.py:529
 msgid "Removing user {u!r} from group {g!r} ..."
 msgstr "Lösche Nutzer {u!r} aus der Gruppe {g!r} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:442 lib/pp_admintools/app/remove_ldap_user.py:469
-#: lib/pp_admintools/app/remove_ldap_user.py:500 lib/pp_admintools/app/remove_ldap_user.py:531
+#: lib/pp_admintools/app/remove_ldap_user.py:445 lib/pp_admintools/app/remove_ldap_user.py:472
+#: lib/pp_admintools/app/remove_ldap_user.py:503 lib/pp_admintools/app/remove_ldap_user.py:534
 msgid "{c} on removing user {dn!r} from group {g!r}: {e}"
 msgstr "{c} beim Löschen des Nutzers {dn!r} von der Gruppe {g!r}: {e}"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:458
+#: lib/pp_admintools/app/remove_ldap_user.py:461
 msgid "Did not found any unique group memberships of {dn!r} in {inst}."
 msgstr "Keine eindeutigen Gruppenmitgliedschaften von {dn!r} in {inst} gefunden."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:482
+#: lib/pp_admintools/app/remove_ldap_user.py:485
 msgid "Deleting user {uid!r} from all POSIX groups in {inst}."
 msgstr "Lösche Nutzer {uid!r} aus allen POSIX-Gruppen in {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:489
+#: lib/pp_admintools/app/remove_ldap_user.py:492
 msgid "Did not found any POSIX group memberships of {uid!r} in {inst}."
 msgstr "Keine POSIX-Gruppenmitgliedschaften von {uid!r} in {inst} gefunden."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:513
+#: lib/pp_admintools/app/remove_ldap_user.py:516
 msgid "Deleting user {uid!r} from all sudo groups in {inst}."
 msgstr "Lösche Nutzer {uid!r} aus allen sudo-Gruppen in {inst}."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:520
+#: lib/pp_admintools/app/remove_ldap_user.py:523
 msgid "Did not found any sudo group memberships of {uid!r} in {inst}."
 msgstr "Keine sudo-Gruppenmitgliedschaften von {uid!r} in {inst} gefunden."
 

diff --git a/locale/en_US/LC_MESSAGES/pp_admintools.po b/locale/en_US/LC_MESSAGES/pp_admintools.po
index e9dfd3250949a01d07c812fb10259ef4045c9285..08ed39971e0ba7dcb1536d1a15a68c22b3eb8188 100644 (file)
--- a/locale/en_US/LC_MESSAGES/pp_admintools.po
+++ b/locale/en_US/LC_MESSAGES/pp_admintools.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.8.8\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2023-05-26 12:48+0200\n"
-"PO-Revision-Date: 2023-05-26 12:00+0100\n"
+"POT-Creation-Date: 2023-05-31 10:50+0200\n"
+"PO-Revision-Date: 2023-05-31 10:53+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: en_US\n"
 "Language-Team: Frank Brehm <frank.brehm@pixelpark.com>\n"
@@ -300,57 +300,61 @@ msgstr ""
 msgid "No changes to attribute {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:855
-msgid "Removing all no more used alias entries ..."
-msgstr "Removing all no more used alias entries …"
-
-#: lib/pp_admintools/app/barracuda_sync.py:862
+#: lib/pp_admintools/app/barracuda_sync.py:858
 msgid "No aliases found to remove in LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:877
+#: lib/pp_admintools/app/barracuda_sync.py:865
+msgid "Removing all no more used alias entries ..."
+msgstr "Removing all no more used alias entries …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:878
 msgid "One alias entry removed in LDAP."
 msgid_plural "{} alias entries removed in LDAP."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:888
-msgid "Adding failing LDAP aliases ..."
-msgstr "Adding failing LDAP aliases …"
-
-#: lib/pp_admintools/app/barracuda_sync.py:895
+#: lib/pp_admintools/app/barracuda_sync.py:892
 msgid "No aliases found to create in LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:905
+#: lib/pp_admintools/app/barracuda_sync.py:899
+msgid "Adding failing LDAP aliases ..."
+msgstr "Adding failing LDAP aliases …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:907
 msgid "Creating LDAP alias {a!r} => {dn!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:913
+#: lib/pp_admintools/app/barracuda_sync.py:915
 msgid "One alias entry created in LDAP."
 msgid_plural "{} alias entries created in LDAP."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:924
-msgid "Modifying existing alias entries ..."
-msgstr "Modifying existing alias entries …"
-
-#: lib/pp_admintools/app/barracuda_sync.py:931
+#: lib/pp_admintools/app/barracuda_sync.py:929
 msgid "No aliases found to mofify in LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:940
+#: lib/pp_admintools/app/barracuda_sync.py:936
+msgid "Modifying existing alias entries ..."
+msgstr "Modifying existing alias entries …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:943
 msgid "Modifying LDAP alias {!r} ..."
 msgstr "Modifying LDAP entry {!r} …"
 
-#: lib/pp_admintools/app/barracuda_sync.py:948
+#: lib/pp_admintools/app/barracuda_sync.py:951
 msgid "One alias entry modified in LDAP."
 msgid_plural "{} alias entries modified in LDAP."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:968 lib/pp_admintools/app/mirror_ldap.py:317
+#: lib/pp_admintools/app/barracuda_sync.py:961
+msgid "Get all necessary data from LDAP and static virtual aliases table ..."
+msgstr "Get all necessary data from LDAP and static virtual aliases table …"
+
+#: lib/pp_admintools/app/barracuda_sync.py:972 lib/pp_admintools/app/mirror_ldap.py:317
 msgid "Finished."
 msgstr ""
 
@@ -767,7 +771,7 @@ msgid "Options fo LDAP connections"
 msgstr ""
 
 #: lib/pp_admintools/app/ldap.py:335 lib/pp_admintools/app/mirror_ldap.py:244
-#: lib/pp_admintools/app/remove_ldap_user.py:280 lib/pp_admintools/app/set_ldap_password.py:492
+#: lib/pp_admintools/app/remove_ldap_user.py:283 lib/pp_admintools/app/set_ldap_password.py:492
 msgid "No"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr "Trying to evaluate DN of user {u!r} as a LDAP DN …"
 msgid "Trying to evaluate DN of user {u!r} as a UID (Posix user name) ..."
 msgstr "Trying to evaluate DN of user {u!r} as a UID (Posix user name) …"
 
-#: lib/pp_admintools/app/ldap.py:958 lib/pp_admintools/app/remove_ldap_user.py:290
+#: lib/pp_admintools/app/ldap.py:958 lib/pp_admintools/app/remove_ldap_user.py:293
 msgid "Empty user given."
 msgstr ""
 
@@ -1095,9 +1099,9 @@ msgid "Modification of {dn!r} was NOT successfull - {c}: {e}"
 msgstr ""
 
 #: lib/pp_admintools/app/ldap.py:1312 lib/pp_admintools/app/ldap.py:1331
-#: lib/pp_admintools/app/remove_ldap_user.py:417 lib/pp_admintools/app/remove_ldap_user.py:444
-#: lib/pp_admintools/app/remove_ldap_user.py:471 lib/pp_admintools/app/remove_ldap_user.py:502
-#: lib/pp_admintools/app/remove_ldap_user.py:533 lib/pp_admintools/app/set_ldap_password.py:521
+#: lib/pp_admintools/app/remove_ldap_user.py:420 lib/pp_admintools/app/remove_ldap_user.py:447
+#: lib/pp_admintools/app/remove_ldap_user.py:474 lib/pp_admintools/app/remove_ldap_user.py:505
+#: lib/pp_admintools/app/remove_ldap_user.py:536 lib/pp_admintools/app/set_ldap_password.py:521
 msgid "Changes:"
 msgstr ""
 
@@ -1329,7 +1333,7 @@ msgstr ""
 msgid "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) [{yes}/{no}]?"
 msgstr "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) [{yes}/{no}]?"
 
-#: lib/pp_admintools/app/mirror_ldap.py:244 lib/pp_admintools/app/remove_ldap_user.py:280
+#: lib/pp_admintools/app/mirror_ldap.py:244 lib/pp_admintools/app/remove_ldap_user.py:283
 #: lib/pp_admintools/app/set_ldap_password.py:492
 msgid "yes"
 msgstr ""
@@ -1763,149 +1767,149 @@ msgstr ""
 msgid "No users to remove given."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:174
+#: lib/pp_admintools/app/remove_ldap_user.py:177
 msgid "Checking given instances for admin and read/write access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:181
+#: lib/pp_admintools/app/remove_ldap_user.py:184
 msgid "LDAP instance {!r} not found in configuration."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:189
+#: lib/pp_admintools/app/remove_ldap_user.py:192
 msgid "LDAP instance {!r} has only readonly access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:194
+#: lib/pp_admintools/app/remove_ldap_user.py:197
 msgid "No admin access to LDAP instance {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:211
+#: lib/pp_admintools/app/remove_ldap_user.py:214
 msgid "All given users were not found in any LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:216
+#: lib/pp_admintools/app/remove_ldap_user.py:219
 msgid "Evaluated DNs to remove:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:225
+#: lib/pp_admintools/app/remove_ldap_user.py:228
 msgid "Start disabling user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:227
+#: lib/pp_admintools/app/remove_ldap_user.py:230
 msgid "Start removing user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:231
+#: lib/pp_admintools/app/remove_ldap_user.py:234
 msgid "Start disabling user entries ..."
 msgstr "Start disabling user entries …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:233
+#: lib/pp_admintools/app/remove_ldap_user.py:236
 msgid "Start removing user entries ..."
 msgstr "Start removing user entries …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:248
+#: lib/pp_admintools/app/remove_ldap_user.py:251
 msgid "Do you really want to deactivate the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:250
+#: lib/pp_admintools/app/remove_ldap_user.py:253
 msgid "Do you really want to remove the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:276
+#: lib/pp_admintools/app/remove_ldap_user.py:279
 msgid "Deactivate [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:278
+#: lib/pp_admintools/app/remove_ldap_user.py:281
 msgid "Remove [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:286
+#: lib/pp_admintools/app/remove_ldap_user.py:289
 msgid "Evaluating DNs of the user {!r} to remove ..."
 msgstr "Evaluating DNs of the user {!r} to remove …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:300 lib/pp_admintools/app/set_ldap_password.py:434
+#: lib/pp_admintools/app/remove_ldap_user.py:303 lib/pp_admintools/app/set_ldap_password.py:434
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:307 lib/pp_admintools/app/set_ldap_password.py:439
+#: lib/pp_admintools/app/remove_ldap_user.py:310 lib/pp_admintools/app/set_ldap_password.py:439
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:319 lib/pp_admintools/app/set_ldap_password.py:453
+#: lib/pp_admintools/app/remove_ldap_user.py:322 lib/pp_admintools/app/set_ldap_password.py:453
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:328
+#: lib/pp_admintools/app/remove_ldap_user.py:331
 msgid "Deactivating all given users from {} ..."
 msgstr "Deactivating all given users from {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:330
+#: lib/pp_admintools/app/remove_ldap_user.py:333
 msgid "Removing all given users from {} ..."
 msgstr "Removing all given users from {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:345
+#: lib/pp_admintools/app/remove_ldap_user.py:348
 msgid "Deactivating user {dn!r} from {inst} ..."
 msgstr "Deactivating user {dn!r} from {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:348
+#: lib/pp_admintools/app/remove_ldap_user.py:351
 msgid "Removing user {dn!r} from {inst} ..."
 msgstr "Removing user {dn!r} from {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:354
+#: lib/pp_admintools/app/remove_ldap_user.py:357
 msgid "Attributes of {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:375
+#: lib/pp_admintools/app/remove_ldap_user.py:378
 msgid "{c} on removing user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:381
+#: lib/pp_admintools/app/remove_ldap_user.py:384
 msgid "User {dn!r} successful deactivated on {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:384
+#: lib/pp_admintools/app/remove_ldap_user.py:387
 msgid "User {dn!r} successful removed from {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:410
+#: lib/pp_admintools/app/remove_ldap_user.py:413
 msgid "Updating user info for {dn!r} on {inst} ..."
 msgstr "Updating user info for {dn!r} on {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:415 lib/pp_admintools/app/set_ldap_password.py:519
+#: lib/pp_admintools/app/remove_ldap_user.py:418 lib/pp_admintools/app/set_ldap_password.py:519
 msgid "{c} on deactivating user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:431
+#: lib/pp_admintools/app/remove_ldap_user.py:434
 msgid "Did not found any group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:437 lib/pp_admintools/app/remove_ldap_user.py:464
-#: lib/pp_admintools/app/remove_ldap_user.py:495 lib/pp_admintools/app/remove_ldap_user.py:526
+#: lib/pp_admintools/app/remove_ldap_user.py:440 lib/pp_admintools/app/remove_ldap_user.py:467
+#: lib/pp_admintools/app/remove_ldap_user.py:498 lib/pp_admintools/app/remove_ldap_user.py:529
 msgid "Removing user {u!r} from group {g!r} ..."
 msgstr "Removing user {u!r} from group {g!r} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:442 lib/pp_admintools/app/remove_ldap_user.py:469
-#: lib/pp_admintools/app/remove_ldap_user.py:500 lib/pp_admintools/app/remove_ldap_user.py:531
+#: lib/pp_admintools/app/remove_ldap_user.py:445 lib/pp_admintools/app/remove_ldap_user.py:472
+#: lib/pp_admintools/app/remove_ldap_user.py:503 lib/pp_admintools/app/remove_ldap_user.py:534
 msgid "{c} on removing user {dn!r} from group {g!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:458
+#: lib/pp_admintools/app/remove_ldap_user.py:461
 msgid "Did not found any unique group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:482
+#: lib/pp_admintools/app/remove_ldap_user.py:485
 msgid "Deleting user {uid!r} from all POSIX groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:489
+#: lib/pp_admintools/app/remove_ldap_user.py:492
 msgid "Did not found any POSIX group memberships of {uid!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:513
+#: lib/pp_admintools/app/remove_ldap_user.py:516
 msgid "Deleting user {uid!r} from all sudo groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:520
+#: lib/pp_admintools/app/remove_ldap_user.py:523
 msgid "Did not found any sudo group memberships of {uid!r} in {inst}."
 msgstr ""
 

diff --git a/locale/pp_admintools.pot b/locale/pp_admintools.pot
index dc46b0349d9692ba949c9982747fa918997aee4e..0cf105f223ad37bd8425908fb78bacf61383fc22 100644 (file)
--- a/locale/pp_admintools.pot
+++ b/locale/pp_admintools.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.8.8\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2023-05-26 12:48+0200\n"
+"POT-Creation-Date: 2023-05-31 10:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <frank.brehm@pixelpark.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,57 +299,61 @@ msgstr ""
 msgid "No changes to attribute {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:855
-msgid "Removing all no more used alias entries ..."
+#: lib/pp_admintools/app/barracuda_sync.py:858
+msgid "No aliases found to remove in LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:862
-msgid "No aliases found to remove in LDAP."
+#: lib/pp_admintools/app/barracuda_sync.py:865
+msgid "Removing all no more used alias entries ..."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:877
+#: lib/pp_admintools/app/barracuda_sync.py:878
 msgid "One alias entry removed in LDAP."
 msgid_plural "{} alias entries removed in LDAP."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:888
-msgid "Adding failing LDAP aliases ..."
+#: lib/pp_admintools/app/barracuda_sync.py:892
+msgid "No aliases found to create in LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:895
-msgid "No aliases found to create in LDAP."
+#: lib/pp_admintools/app/barracuda_sync.py:899
+msgid "Adding failing LDAP aliases ..."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:905
+#: lib/pp_admintools/app/barracuda_sync.py:907
 msgid "Creating LDAP alias {a!r} => {dn!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:913
+#: lib/pp_admintools/app/barracuda_sync.py:915
 msgid "One alias entry created in LDAP."
 msgid_plural "{} alias entries created in LDAP."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:924
-msgid "Modifying existing alias entries ..."
+#: lib/pp_admintools/app/barracuda_sync.py:929
+msgid "No aliases found to mofify in LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:931
-msgid "No aliases found to mofify in LDAP."
+#: lib/pp_admintools/app/barracuda_sync.py:936
+msgid "Modifying existing alias entries ..."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:940
+#: lib/pp_admintools/app/barracuda_sync.py:943
 msgid "Modifying LDAP alias {!r} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:948
+#: lib/pp_admintools/app/barracuda_sync.py:951
 msgid "One alias entry modified in LDAP."
 msgid_plural "{} alias entries modified in LDAP."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/pp_admintools/app/barracuda_sync.py:968 lib/pp_admintools/app/mirror_ldap.py:317
+#: lib/pp_admintools/app/barracuda_sync.py:961
+msgid "Get all necessary data from LDAP and static virtual aliases table ..."
+msgstr ""
+
+#: lib/pp_admintools/app/barracuda_sync.py:972 lib/pp_admintools/app/mirror_ldap.py:317
 msgid "Finished."
 msgstr ""
 
@@ -766,7 +770,7 @@ msgid "Options fo LDAP connections"
 msgstr ""
 
 #: lib/pp_admintools/app/ldap.py:335 lib/pp_admintools/app/mirror_ldap.py:244
-#: lib/pp_admintools/app/remove_ldap_user.py:280 lib/pp_admintools/app/set_ldap_password.py:492
+#: lib/pp_admintools/app/remove_ldap_user.py:283 lib/pp_admintools/app/set_ldap_password.py:492
 msgid "No"
 msgstr ""
 
@@ -990,7 +994,7 @@ msgstr ""
 msgid "Trying to evaluate DN of user {u!r} as a UID (Posix user name) ..."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:958 lib/pp_admintools/app/remove_ldap_user.py:290
+#: lib/pp_admintools/app/ldap.py:958 lib/pp_admintools/app/remove_ldap_user.py:293
 msgid "Empty user given."
 msgstr ""
 
@@ -1094,9 +1098,9 @@ msgid "Modification of {dn!r} was NOT successfull - {c}: {e}"
 msgstr ""
 
 #: lib/pp_admintools/app/ldap.py:1312 lib/pp_admintools/app/ldap.py:1331
-#: lib/pp_admintools/app/remove_ldap_user.py:417 lib/pp_admintools/app/remove_ldap_user.py:444
-#: lib/pp_admintools/app/remove_ldap_user.py:471 lib/pp_admintools/app/remove_ldap_user.py:502
-#: lib/pp_admintools/app/remove_ldap_user.py:533 lib/pp_admintools/app/set_ldap_password.py:521
+#: lib/pp_admintools/app/remove_ldap_user.py:420 lib/pp_admintools/app/remove_ldap_user.py:447
+#: lib/pp_admintools/app/remove_ldap_user.py:474 lib/pp_admintools/app/remove_ldap_user.py:505
+#: lib/pp_admintools/app/remove_ldap_user.py:536 lib/pp_admintools/app/set_ldap_password.py:521
 msgid "Changes:"
 msgstr ""
 
@@ -1328,7 +1332,7 @@ msgstr ""
 msgid "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:244 lib/pp_admintools/app/remove_ldap_user.py:280
+#: lib/pp_admintools/app/mirror_ldap.py:244 lib/pp_admintools/app/remove_ldap_user.py:283
 #: lib/pp_admintools/app/set_ldap_password.py:492
 msgid "yes"
 msgstr ""
@@ -1762,149 +1766,149 @@ msgstr ""
 msgid "No users to remove given."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:174
+#: lib/pp_admintools/app/remove_ldap_user.py:177
 msgid "Checking given instances for admin and read/write access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:181
+#: lib/pp_admintools/app/remove_ldap_user.py:184
 msgid "LDAP instance {!r} not found in configuration."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:189
+#: lib/pp_admintools/app/remove_ldap_user.py:192
 msgid "LDAP instance {!r} has only readonly access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:194
+#: lib/pp_admintools/app/remove_ldap_user.py:197
 msgid "No admin access to LDAP instance {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:211
+#: lib/pp_admintools/app/remove_ldap_user.py:214
 msgid "All given users were not found in any LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:216
+#: lib/pp_admintools/app/remove_ldap_user.py:219
 msgid "Evaluated DNs to remove:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:225
+#: lib/pp_admintools/app/remove_ldap_user.py:228
 msgid "Start disabling user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:227
+#: lib/pp_admintools/app/remove_ldap_user.py:230
 msgid "Start removing user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:231
+#: lib/pp_admintools/app/remove_ldap_user.py:234
 msgid "Start disabling user entries ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:233
+#: lib/pp_admintools/app/remove_ldap_user.py:236
 msgid "Start removing user entries ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:248
+#: lib/pp_admintools/app/remove_ldap_user.py:251
 msgid "Do you really want to deactivate the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:250
+#: lib/pp_admintools/app/remove_ldap_user.py:253
 msgid "Do you really want to remove the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:276
+#: lib/pp_admintools/app/remove_ldap_user.py:279
 msgid "Deactivate [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:278
+#: lib/pp_admintools/app/remove_ldap_user.py:281
 msgid "Remove [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:286
+#: lib/pp_admintools/app/remove_ldap_user.py:289
 msgid "Evaluating DNs of the user {!r} to remove ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:300 lib/pp_admintools/app/set_ldap_password.py:434
+#: lib/pp_admintools/app/remove_ldap_user.py:303 lib/pp_admintools/app/set_ldap_password.py:434
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:307 lib/pp_admintools/app/set_ldap_password.py:439
+#: lib/pp_admintools/app/remove_ldap_user.py:310 lib/pp_admintools/app/set_ldap_password.py:439
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:319 lib/pp_admintools/app/set_ldap_password.py:453
+#: lib/pp_admintools/app/remove_ldap_user.py:322 lib/pp_admintools/app/set_ldap_password.py:453
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:328
+#: lib/pp_admintools/app/remove_ldap_user.py:331
 msgid "Deactivating all given users from {} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:330
+#: lib/pp_admintools/app/remove_ldap_user.py:333
 msgid "Removing all given users from {} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:345
+#: lib/pp_admintools/app/remove_ldap_user.py:348
 msgid "Deactivating user {dn!r} from {inst} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:348
+#: lib/pp_admintools/app/remove_ldap_user.py:351
 msgid "Removing user {dn!r} from {inst} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:354
+#: lib/pp_admintools/app/remove_ldap_user.py:357
 msgid "Attributes of {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:375
+#: lib/pp_admintools/app/remove_ldap_user.py:378
 msgid "{c} on removing user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:381
+#: lib/pp_admintools/app/remove_ldap_user.py:384
 msgid "User {dn!r} successful deactivated on {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:384
+#: lib/pp_admintools/app/remove_ldap_user.py:387
 msgid "User {dn!r} successful removed from {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:410
+#: lib/pp_admintools/app/remove_ldap_user.py:413
 msgid "Updating user info for {dn!r} on {inst} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:415 lib/pp_admintools/app/set_ldap_password.py:519
+#: lib/pp_admintools/app/remove_ldap_user.py:418 lib/pp_admintools/app/set_ldap_password.py:519
 msgid "{c} on deactivating user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:431
+#: lib/pp_admintools/app/remove_ldap_user.py:434
 msgid "Did not found any group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:437 lib/pp_admintools/app/remove_ldap_user.py:464
-#: lib/pp_admintools/app/remove_ldap_user.py:495 lib/pp_admintools/app/remove_ldap_user.py:526
+#: lib/pp_admintools/app/remove_ldap_user.py:440 lib/pp_admintools/app/remove_ldap_user.py:467
+#: lib/pp_admintools/app/remove_ldap_user.py:498 lib/pp_admintools/app/remove_ldap_user.py:529
 msgid "Removing user {u!r} from group {g!r} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:442 lib/pp_admintools/app/remove_ldap_user.py:469
-#: lib/pp_admintools/app/remove_ldap_user.py:500 lib/pp_admintools/app/remove_ldap_user.py:531
+#: lib/pp_admintools/app/remove_ldap_user.py:445 lib/pp_admintools/app/remove_ldap_user.py:472
+#: lib/pp_admintools/app/remove_ldap_user.py:503 lib/pp_admintools/app/remove_ldap_user.py:534
 msgid "{c} on removing user {dn!r} from group {g!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:458
+#: lib/pp_admintools/app/remove_ldap_user.py:461
 msgid "Did not found any unique group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:482
+#: lib/pp_admintools/app/remove_ldap_user.py:485
 msgid "Deleting user {uid!r} from all POSIX groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:489
+#: lib/pp_admintools/app/remove_ldap_user.py:492
 msgid "Did not found any POSIX group memberships of {uid!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:513
+#: lib/pp_admintools/app/remove_ldap_user.py:516
 msgid "Deleting user {uid!r} from all sudo groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:520
+#: lib/pp_admintools/app/remove_ldap_user.py:523
 msgid "Did not found any sudo group memberships of {uid!r} in {inst}."
 msgstr ""