Make the linter happy

diff --git a/lib/pp_admintools/app/mirror_ldap.py b/lib/pp_admintools/app/mirror_ldap.py
index 1c304f4d98a41dd87bb925cbbaa269d9734e86dc..597cd51037208bb6cf013d70c43d8e3071ebd718 100644 (file)
--- a/lib/pp_admintools/app/mirror_ldap.py
+++ b/lib/pp_admintools/app/mirror_ldap.py
@@ -24,7 +24,6 @@ from functools import cmp_to_key
 from fb_tools.common import pp
 # from fb_tools.collections import FrozenCIStringSet, CIStringSet, CIDict
 from fb_tools.collections import CIDict, CIStringSet
-from fb_tools.errors import AbortAppError, TimeoutOnPromptError
 
 from ..xlate import XLATOR
 
@@ -216,7 +215,7 @@ class MirrorLdapApplication(BaseLdapApplication):
             yes=self.colored(_('yes'), 'RED'), no=self.colored(_('No'), 'GREEN')) + ' '
 
         self.empty_line()
-        answer =  self.ask_for_yes_or_no(msg)
+        answer = self.ask_for_yes_or_no(msg)
         if not answer:
             self.empty_line()
             LOG.error(_("Interrupted on demand."))

diff --git a/lib/pp_admintools/app/remove_ldap_user.py b/lib/pp_admintools/app/remove_ldap_user.py
index f89b610af64a845f5e6f94ea3d3df8586a75f75e..b0feb4ad4e57b0de2f41129d129676553dc485d6 100644 (file)
--- a/lib/pp_admintools/app/remove_ldap_user.py
+++ b/lib/pp_admintools/app/remove_ldap_user.py
@@ -17,7 +17,6 @@ from ldap3 import MODIFY_REPLACE, MODIFY_ADD, MODIFY_DELETE
 
 # Own modules
 from fb_tools.common import to_bool, is_sequence, pp
-from fb_tools.errors import AbortAppError, TimeoutOnPromptError
 
 from ..xlate import XLATOR
 

diff --git a/locale/de_DE/LC_MESSAGES/pp_admintools.po b/locale/de_DE/LC_MESSAGES/pp_admintools.po
index 3eecd06e51170b90b928f371f5541418bacaeaed..d9c13887dfbfc675da56d5d0a1b3b7da3030d625 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/pp_admintools.po
+++ b/locale/de_DE/LC_MESSAGES/pp_admintools.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.9.1\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2022-10-20 17:39+0200\n"
+"POT-Creation-Date: 2022-10-20 17:42+0200\n"
 "PO-Revision-Date: 2022-10-20 17:12+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: de_DE\n"
@@ -326,8 +326,8 @@ msgstr "Optionen für die Vorgabe-LDAP-Verbindung"
 msgid "Options fo LDAP connections"
 msgstr "Optionen für die LDAP-Verbindungen"
 
-#: lib/pp_admintools/app/ldap.py:327 lib/pp_admintools/app/mirror_ldap.py:216
-#: lib/pp_admintools/app/remove_ldap_user.py:279 lib/pp_admintools/app/set_ldap_password.py:583
+#: lib/pp_admintools/app/ldap.py:327 lib/pp_admintools/app/mirror_ldap.py:215
+#: lib/pp_admintools/app/remove_ldap_user.py:278 lib/pp_admintools/app/set_ldap_password.py:583
 msgid "No"
 msgstr "Nein"
 
@@ -417,7 +417,7 @@ msgstr ""
 " außer {default!r} verwendet. Es ist ebenfalls möglich, den Wert {val_list!r} anzugeben, in "
 "diesem Fall werden alle LDAP-Instanzen ausgegeben, und das Skript beendet sich."
 
-#: lib/pp_admintools/app/ldap.py:429 lib/pp_admintools/app/mirror_ldap.py:108
+#: lib/pp_admintools/app/ldap.py:429 lib/pp_admintools/app/mirror_ldap.py:107
 msgid "SECONDS"
 msgstr "SEKUNDEN"
 
@@ -529,7 +529,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:872 lib/pp_admintools/app/remove_ldap_user.py:289
+#: lib/pp_admintools/app/ldap.py:872 lib/pp_admintools/app/remove_ldap_user.py:288
 msgid "Empty user given."
 msgstr "Leere Nutzername übergeben."
 
@@ -604,9 +604,9 @@ msgstr "Simulationsmodus - hier wird jetzt nichts geändert."
 msgid "Modification NOT successfull - {c}: {e}"
 msgstr "Die Änderung war NICHT erfolgreich - {c}: {e}"
 
-#: lib/pp_admintools/app/ldap.py:1171 lib/pp_admintools/app/remove_ldap_user.py:416
-#: lib/pp_admintools/app/remove_ldap_user.py:443 lib/pp_admintools/app/remove_ldap_user.py:470
-#: lib/pp_admintools/app/remove_ldap_user.py:501 lib/pp_admintools/app/remove_ldap_user.py:532
+#: lib/pp_admintools/app/ldap.py:1171 lib/pp_admintools/app/remove_ldap_user.py:415
+#: 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/set_ldap_password.py:612
 msgid "Changes:"
 msgstr "Änderungen:"
@@ -746,7 +746,7 @@ msgstr "Die zu sendende Mail:"
 msgid "Did not found sendmail executable."
 msgstr "Kein ausführbares Programm 'sendmail' gefunden."
 
-#: lib/pp_admintools/app/mirror_ldap.py:87
+#: lib/pp_admintools/app/mirror_ldap.py:86
 msgid ""
 "Mirror the content of a complete LDAP instance (server or cluster) to another instance. This "
 "will be done first by clearing the target instance, then copying structural entries from the "
@@ -760,15 +760,15 @@ msgstr ""
 "dessen werden einige Transformationen ausgeführt, wie die Erssetzung der Inhalte bestimmter "
 "Attribute durch andere Werte."
 
-#: lib/pp_admintools/app/mirror_ldap.py:95
+#: lib/pp_admintools/app/mirror_ldap.py:94
 msgid "Do not execute a countdown before starting the application."
 msgstr "Keinen Countdown vor dem Start der Anwendung ausführen."
 
-#: lib/pp_admintools/app/mirror_ldap.py:105
+#: lib/pp_admintools/app/mirror_ldap.py:104
 msgid "Miroring options"
 msgstr "Spiegelungs--Optionen"
 
-#: lib/pp_admintools/app/mirror_ldap.py:110
+#: lib/pp_admintools/app/mirror_ldap.py:109
 msgid ""
 "Number of seconds to wait after each write operation. Given as a float value, and if set to "
 "zero, there is no waiting after a write. (default: {:.1f})"
@@ -777,50 +777,50 @@ msgstr ""
 "angegeben, und wenn sie auf Null gesetzt werden, erfolgt kein Warten nach dem Schreiben. "
 "(Vorgabe: {:.1f})"
 
-#: lib/pp_admintools/app/mirror_ldap.py:117
+#: lib/pp_admintools/app/mirror_ldap.py:116
 msgid "NUMBER"
 msgstr "ANZAHL"
 
-#: lib/pp_admintools/app/mirror_ldap.py:119
+#: lib/pp_admintools/app/mirror_ldap.py:118
 msgid "Limiting the mirroring to the first NUMBER entries. This option is valid only in simulation mode."
 msgstr ""
 "Begrenzung der Spiegelung auf die erste ANZAHL Einträge. Diese Option ist nur im Simulations-"
 "Modus gültig."
 
-#: lib/pp_admintools/app/mirror_ldap.py:126
+#: lib/pp_admintools/app/mirror_ldap.py:125
 msgid "Mirror only structural entries (entries with childs)."
 msgstr "Nur strukturelle Einträge (Einträge mit Child-Einträgen) spiegeln."
 
-#: lib/pp_admintools/app/mirror_ldap.py:148
+#: lib/pp_admintools/app/mirror_ldap.py:147
 msgid "Limiting the number of entries for mirroring to {} entries."
 msgstr "Begrenze die Anzahl der Einträge zum Spiegeln auf {}."
 
-#: lib/pp_admintools/app/mirror_ldap.py:152
+#: lib/pp_admintools/app/mirror_ldap.py:151
 msgid "Limition the number of entries for mirroring may only be done in simulation mode."
 msgstr "Die Begrenzung der Anzahl der Einträge zum Spiegeln ist nur im Simulationsmodus erlaubt."
 
-#: lib/pp_admintools/app/mirror_ldap.py:168
+#: lib/pp_admintools/app/mirror_ldap.py:167
 msgid "Checking mirror source instance for target instance {!r} ..."
 msgstr "Überprüfe die Quell-Instanz für Spiegelung zur Ziel-Instanz {!r} …"
 
-#: lib/pp_admintools/app/mirror_ldap.py:172
+#: lib/pp_admintools/app/mirror_ldap.py:171
 msgid "Got {!r} as the mirror source instance."
 msgstr "Habe {!r} als Quell-Instanz für die Spiegelung erhalten."
 
-#: lib/pp_admintools/app/mirror_ldap.py:175 lib/pp_admintools/app/mirror_ldap.py:184
-#: lib/pp_admintools/app/mirror_ldap.py:195
+#: lib/pp_admintools/app/mirror_ldap.py:174 lib/pp_admintools/app/mirror_ldap.py:183
+#: lib/pp_admintools/app/mirror_ldap.py:194
 msgid "Error in configuration:"
 msgstr "Fehler in der Konfiguration:"
 
-#: lib/pp_admintools/app/mirror_ldap.py:176
+#: lib/pp_admintools/app/mirror_ldap.py:175
 msgid "the source LDAP instance {src!r} for mirroring to {tgt!r} does not exists."
 msgstr "die Quell-LDAP-Instanz {src!r} für die Spiegelung nach {tgt!r} existiert nicht."
 
-#: lib/pp_admintools/app/mirror_ldap.py:185
+#: lib/pp_admintools/app/mirror_ldap.py:184
 msgid "the source LDAP instance {src!r} must not be the same like the target instance."
 msgstr "die Quell-LDAP-Instanz {src!r} darf nicht identisch mit der Ziel-Instanz sein."
 
-#: lib/pp_admintools/app/mirror_ldap.py:196
+#: lib/pp_admintools/app/mirror_ldap.py:195
 msgid ""
 "the base DN {src_dn!r} of the source instance {src!r} does not match the base DN {tgt_dn!r} of "
 "the target instance {tgt!r}."
@@ -828,48 +828,48 @@ msgstr ""
 "die Basis-DN {src_dn!r} der Quell-Instanz {src!r} stimmt nicht mit der Basis-DN {tgt_dn!r} der "
 "Ziel-Instanz {tgt!r} überein."
 
-#: lib/pp_admintools/app/mirror_ldap.py:212
+#: lib/pp_admintools/app/mirror_ldap.py:211
 msgid "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) [{yes}/{no}]?"
 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:216 lib/pp_admintools/app/remove_ldap_user.py:279
+#: lib/pp_admintools/app/mirror_ldap.py:215 lib/pp_admintools/app/remove_ldap_user.py:278
 #: lib/pp_admintools/app/set_ldap_password.py:583
 msgid "yes"
 msgstr "ja"
 
-#: lib/pp_admintools/app/mirror_ldap.py:222 lib/pp_admintools/app/mirror_ldap.py:240
+#: lib/pp_admintools/app/mirror_ldap.py:221 lib/pp_admintools/app/mirror_ldap.py:239
 msgid "Interrupted on demand."
 msgstr "Abbruch auf Verlangen."
 
-#: lib/pp_admintools/app/mirror_ldap.py:227
+#: lib/pp_admintools/app/mirror_ldap.py:226
 msgid "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) ..."
 msgstr "Starte Spiegelung der LDAP-Instanz {src!r} ({src_url}) zur Instanz {tgt!r} ({tgt_url}) …"
 
-#: lib/pp_admintools/app/mirror_ldap.py:240
+#: lib/pp_admintools/app/mirror_ldap.py:239
 msgid "Got a {}:"
 msgstr "Habe ein {} erhalten:"
 
-#: lib/pp_admintools/app/mirror_ldap.py:249
+#: lib/pp_admintools/app/mirror_ldap.py:248
 msgid "Removing all existing entries in target LDAP instance (except the base DN entry, of course)."
 msgstr ""
 "Löschen aller existierender Einträge in der Ziel-LDAP-Instanz (natürlich außer dem mit der "
 "Basis-DN)."
 
-#: lib/pp_admintools/app/mirror_ldap.py:261
+#: lib/pp_admintools/app/mirror_ldap.py:260
 msgid "Trying to get DNs of all entries in the target LDAP instance."
 msgstr "Versuche die DNs aller Einträge in der Ziel-LDAP-Instanz zu ermitteln."
 
-#: lib/pp_admintools/app/mirror_ldap.py:302
+#: lib/pp_admintools/app/mirror_ldap.py:301
 msgid "Removing all non structural entries from target LDAP instance."
 msgstr "Löschen aller nicht-strukturellen Einträge in der Ziel-LDAP-Instanz."
 
-#: lib/pp_admintools/app/mirror_ldap.py:314
+#: lib/pp_admintools/app/mirror_ldap.py:313
 msgid "Entry {!r} is a structural entry, will not be removed at this point."
 msgstr "Der Eintrag {!r} ist ein struktureller Eintrag, und wird deshalb an dieser Stelle nicht gelöscht."
 
-#: lib/pp_admintools/app/mirror_ldap.py:330
+#: lib/pp_admintools/app/mirror_ldap.py:329
 msgid "Removing all structural entries from target LDAP instance."
 msgstr "Löschen aller strukturellen Einträge in der Ziel-LDAP-Instanz."
 
@@ -969,7 +969,7 @@ msgstr "Erhaltene Antwort:"
 msgid "Zone object:"
 msgstr "Zonen-Objekt:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:69
+#: lib/pp_admintools/app/remove_ldap_user.py:68
 msgid ""
 "Disables or removes the given users from LDAP. If disabling, then the user will not be really "
 "removed, but disabled by locking the password, setting all status flags to {inact!r}, assigning "
@@ -981,32 +981,32 @@ msgstr ""
 "auf {inact!r}, Zuweisen von {shell!r} als Login-Shell und Löschen des Nutzers aus allen Gruppen "
 "deaktiviert. Beim Löschen wird der Nutzer tatsächlich im LDAP gelöscht."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:114
+#: lib/pp_admintools/app/remove_ldap_user.py:113
 msgid "Removing options"
 msgstr "Lösch-Optionen"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:117
+#: lib/pp_admintools/app/remove_ldap_user.py:116
 msgid "This is the default."
 msgstr "Dieses ist die Vorgabe."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:118
+#: lib/pp_admintools/app/remove_ldap_user.py:117
 msgid "This is mutually exclusive to {!r}."
 msgstr "Das schließt sich mit {!r} gegenseitig aus."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:120
+#: lib/pp_admintools/app/remove_ldap_user.py:119
 msgid "Deactivating the user instead of removing it."
 msgstr "Deaktivieren der Nutzer anstatt Löschung."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:127
+#: lib/pp_admintools/app/remove_ldap_user.py:126
 msgid "Removing the user from LDAP."
 msgstr "Löschen der übergebenen Nutzer im LDAP."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:135 lib/pp_admintools/app/set_ldap_password.py:273
+#: lib/pp_admintools/app/remove_ldap_user.py:134 lib/pp_admintools/app/set_ldap_password.py:273
 #: lib/pp_admintools/app/set_ldap_password.py:276
 msgid "USER"
 msgstr "NUTZER"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:136
+#: lib/pp_admintools/app/remove_ldap_user.py:135
 msgid ""
 "The user, which should be deactivated or removed. They may be given by their Uid (the "
 "alphanumeric POSIX name), their mail address or their LDAP DN (be aware, that this may be "
@@ -1017,153 +1017,153 @@ msgstr ""
 "angegeben werden. Bitte beachten, dass sich letzterer bei den verschiedenen LDAP-Instanzen "
 "unterscheiden kann."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:160
+#: lib/pp_admintools/app/remove_ldap_user.py:159
 msgid "No users to remove given."
 msgstr "Kein Nutzername zum Löschen angegeben."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:173
+#: lib/pp_admintools/app/remove_ldap_user.py:172
 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:180
+#: lib/pp_admintools/app/remove_ldap_user.py:179
 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:188
+#: lib/pp_admintools/app/remove_ldap_user.py:187
 msgid "LDAP instance {!r} has only readonly access."
 msgstr "Die LDAP-Instanz {!r} besitzt nur Lesezugriffsrechte."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:193
+#: lib/pp_admintools/app/remove_ldap_user.py:192
 msgid "No admin access to LDAP instance {!r}."
 msgstr "Keine Admin-Zugriffsrechte bei LDAP-Instanz {!r}."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:210
+#: lib/pp_admintools/app/remove_ldap_user.py:209
 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:215
+#: lib/pp_admintools/app/remove_ldap_user.py:214
 msgid "Evaluated DNs to remove:"
 msgstr "Zum Löschen ermittelte DNs:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:224
+#: lib/pp_admintools/app/remove_ldap_user.py:223
 msgid "Start disabling user entries in:"
 msgstr "Beginne Deaktivierung der Nutzereinträge in:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:226
+#: lib/pp_admintools/app/remove_ldap_user.py:225
 msgid "Start removing user entries in:"
 msgstr "Beginne Löschung der Nutzereinträge in:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:230
+#: lib/pp_admintools/app/remove_ldap_user.py:229
 msgid "Start disabling user entries ..."
 msgstr "Beginne Deaktivierung der Nutzereinträge …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:232
+#: lib/pp_admintools/app/remove_ldap_user.py:231
 msgid "Start removing user entries ..."
 msgstr "Beginne Löschung der Nutzereinträge …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:247
+#: lib/pp_admintools/app/remove_ldap_user.py:246
 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:249
+#: lib/pp_admintools/app/remove_ldap_user.py:248
 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:275
+#: lib/pp_admintools/app/remove_ldap_user.py:274
 msgid "Deactivate [{yes}/{no}]?"
 msgstr "Deaktivieren [{yes}/{no}]?"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:277
+#: lib/pp_admintools/app/remove_ldap_user.py:276
 msgid "Remove [{yes}/{no}]?"
 msgstr "Löschen [{yes}/{no}]?"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:285
+#: lib/pp_admintools/app/remove_ldap_user.py:284
 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:299 lib/pp_admintools/app/set_ldap_password.py:531
+#: lib/pp_admintools/app/remove_ldap_user.py:298 lib/pp_admintools/app/set_ldap_password.py:531
 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:306 lib/pp_admintools/app/set_ldap_password.py:536
+#: lib/pp_admintools/app/remove_ldap_user.py:305 lib/pp_admintools/app/set_ldap_password.py:536
 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:318 lib/pp_admintools/app/set_ldap_password.py:550
+#: lib/pp_admintools/app/remove_ldap_user.py:317 lib/pp_admintools/app/set_ldap_password.py:550
 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:327
+#: lib/pp_admintools/app/remove_ldap_user.py:326
 msgid "Deactivating all given users from {} ..."
 msgstr "Deaktivieren aller übergebenen Nutzer in {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:329
+#: lib/pp_admintools/app/remove_ldap_user.py:328
 msgid "Removing all given users from {} ..."
 msgstr "Lösche alle übergebenen Nutzer in {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:344
+#: lib/pp_admintools/app/remove_ldap_user.py:343
 msgid "Deactivating user {dn!r} from {inst} ..."
 msgstr "Deaktivieren von Nutzer {dn!r} in {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:347
+#: lib/pp_admintools/app/remove_ldap_user.py:346
 msgid "Removing user {dn!r} from {inst} ..."
 msgstr "Lösche Nutzer {dn!r} in {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:353
+#: lib/pp_admintools/app/remove_ldap_user.py:352
 msgid "Attributes of {!r}:"
 msgstr "Attribute von {!r}:"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:374
+#: lib/pp_admintools/app/remove_ldap_user.py:373
 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:380
+#: lib/pp_admintools/app/remove_ldap_user.py:379
 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:383
+#: lib/pp_admintools/app/remove_ldap_user.py:382
 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:409
+#: lib/pp_admintools/app/remove_ldap_user.py:408
 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:414 lib/pp_admintools/app/set_ldap_password.py:610
+#: lib/pp_admintools/app/remove_ldap_user.py:413 lib/pp_admintools/app/set_ldap_password.py:610
 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:430
+#: lib/pp_admintools/app/remove_ldap_user.py:429
 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:436 lib/pp_admintools/app/remove_ldap_user.py:463
-#: lib/pp_admintools/app/remove_ldap_user.py:494 lib/pp_admintools/app/remove_ldap_user.py:525
+#: lib/pp_admintools/app/remove_ldap_user.py:435 lib/pp_admintools/app/remove_ldap_user.py:462
+#: lib/pp_admintools/app/remove_ldap_user.py:493 lib/pp_admintools/app/remove_ldap_user.py:524
 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:441 lib/pp_admintools/app/remove_ldap_user.py:468
-#: lib/pp_admintools/app/remove_ldap_user.py:499 lib/pp_admintools/app/remove_ldap_user.py:530
+#: 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 "{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:457
+#: lib/pp_admintools/app/remove_ldap_user.py:456
 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:481
+#: lib/pp_admintools/app/remove_ldap_user.py:480
 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:488
+#: lib/pp_admintools/app/remove_ldap_user.py:487
 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:512
+#: lib/pp_admintools/app/remove_ldap_user.py:511
 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:519
+#: lib/pp_admintools/app/remove_ldap_user.py:518
 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 80ab24d40fb77d3f7f9f750da15d35d4d745ac74..90bab23d607a03b964b3b0aa5111dfa53ae00593 100644 (file)
--- a/locale/en_US/LC_MESSAGES/pp_admintools.po
+++ b/locale/en_US/LC_MESSAGES/pp_admintools.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.9.1\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2022-10-20 17:39+0200\n"
+"POT-Creation-Date: 2022-10-20 17:42+0200\n"
 "PO-Revision-Date: 2022-10-20 12:00+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: en_US\n"
@@ -322,8 +322,8 @@ msgstr ""
 msgid "Options fo LDAP connections"
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:327 lib/pp_admintools/app/mirror_ldap.py:216
-#: lib/pp_admintools/app/remove_ldap_user.py:279 lib/pp_admintools/app/set_ldap_password.py:583
+#: lib/pp_admintools/app/ldap.py:327 lib/pp_admintools/app/mirror_ldap.py:215
+#: lib/pp_admintools/app/remove_ldap_user.py:278 lib/pp_admintools/app/set_ldap_password.py:583
 msgid "No"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgid ""
 "are shown, and the application is exiting."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:429 lib/pp_admintools/app/mirror_ldap.py:108
+#: lib/pp_admintools/app/ldap.py:429 lib/pp_admintools/app/mirror_ldap.py:107
 msgid "SECONDS"
 msgstr ""
 
@@ -517,7 +517,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:872 lib/pp_admintools/app/remove_ldap_user.py:289
+#: lib/pp_admintools/app/ldap.py:872 lib/pp_admintools/app/remove_ldap_user.py:288
 msgid "Empty user given."
 msgstr ""
 
@@ -592,9 +592,9 @@ msgstr ""
 msgid "Modification NOT successfull - {c}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:1171 lib/pp_admintools/app/remove_ldap_user.py:416
-#: lib/pp_admintools/app/remove_ldap_user.py:443 lib/pp_admintools/app/remove_ldap_user.py:470
-#: lib/pp_admintools/app/remove_ldap_user.py:501 lib/pp_admintools/app/remove_ldap_user.py:532
+#: lib/pp_admintools/app/ldap.py:1171 lib/pp_admintools/app/remove_ldap_user.py:415
+#: 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/set_ldap_password.py:612
 msgid "Changes:"
 msgstr ""
@@ -728,7 +728,7 @@ msgstr ""
 msgid "Did not found sendmail executable."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:87
+#: lib/pp_admintools/app/mirror_ldap.py:86
 msgid ""
 "Mirror the content of a complete LDAP instance (server or cluster) to another instance. This "
 "will be done first by clearing the target instance, then copying structural entries from the "
@@ -737,106 +737,106 @@ msgid ""
 "values."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:95
+#: lib/pp_admintools/app/mirror_ldap.py:94
 msgid "Do not execute a countdown before starting the application."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:105
+#: lib/pp_admintools/app/mirror_ldap.py:104
 msgid "Miroring options"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:110
+#: lib/pp_admintools/app/mirror_ldap.py:109
 msgid ""
 "Number of seconds to wait after each write operation. Given as a float value, and if set to "
 "zero, there is no waiting after a write. (default: {:.1f})"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:117
+#: lib/pp_admintools/app/mirror_ldap.py:116
 msgid "NUMBER"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:119
+#: lib/pp_admintools/app/mirror_ldap.py:118
 msgid "Limiting the mirroring to the first NUMBER entries. This option is valid only in simulation mode."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:126
+#: lib/pp_admintools/app/mirror_ldap.py:125
 msgid "Mirror only structural entries (entries with childs)."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:148
+#: lib/pp_admintools/app/mirror_ldap.py:147
 msgid "Limiting the number of entries for mirroring to {} entries."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:152
+#: lib/pp_admintools/app/mirror_ldap.py:151
 msgid "Limition the number of entries for mirroring may only be done in simulation mode."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:168
+#: lib/pp_admintools/app/mirror_ldap.py:167
 msgid "Checking mirror source instance for target instance {!r} ..."
 msgstr "Checking mirror source instance for target instance {!r} …"
 
-#: lib/pp_admintools/app/mirror_ldap.py:172
+#: lib/pp_admintools/app/mirror_ldap.py:171
 msgid "Got {!r} as the mirror source instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:175 lib/pp_admintools/app/mirror_ldap.py:184
-#: lib/pp_admintools/app/mirror_ldap.py:195
+#: lib/pp_admintools/app/mirror_ldap.py:174 lib/pp_admintools/app/mirror_ldap.py:183
+#: lib/pp_admintools/app/mirror_ldap.py:194
 msgid "Error in configuration:"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:176
+#: lib/pp_admintools/app/mirror_ldap.py:175
 msgid "the source LDAP instance {src!r} for mirroring to {tgt!r} does not exists."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:185
+#: lib/pp_admintools/app/mirror_ldap.py:184
 msgid "the source LDAP instance {src!r} must not be the same like the target instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:196
+#: lib/pp_admintools/app/mirror_ldap.py:195
 msgid ""
 "the base DN {src_dn!r} of the source instance {src!r} does not match the base DN {tgt_dn!r} of "
 "the target instance {tgt!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:212
+#: lib/pp_admintools/app/mirror_ldap.py:211
 #, fuzzy
 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}) …"
 
-#: lib/pp_admintools/app/mirror_ldap.py:216 lib/pp_admintools/app/remove_ldap_user.py:279
+#: lib/pp_admintools/app/mirror_ldap.py:215 lib/pp_admintools/app/remove_ldap_user.py:278
 #: lib/pp_admintools/app/set_ldap_password.py:583
 msgid "yes"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:222 lib/pp_admintools/app/mirror_ldap.py:240
+#: lib/pp_admintools/app/mirror_ldap.py:221 lib/pp_admintools/app/mirror_ldap.py:239
 msgid "Interrupted on demand."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:227
+#: lib/pp_admintools/app/mirror_ldap.py:226
 msgid "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) ..."
 msgstr "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) …"
 
-#: lib/pp_admintools/app/mirror_ldap.py:240
+#: lib/pp_admintools/app/mirror_ldap.py:239
 msgid "Got a {}:"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:249
+#: lib/pp_admintools/app/mirror_ldap.py:248
 msgid "Removing all existing entries in target LDAP instance (except the base DN entry, of course)."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:261
+#: lib/pp_admintools/app/mirror_ldap.py:260
 msgid "Trying to get DNs of all entries in the target LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:302
+#: lib/pp_admintools/app/mirror_ldap.py:301
 msgid "Removing all non structural entries from target LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:314
+#: lib/pp_admintools/app/mirror_ldap.py:313
 msgid "Entry {!r} is a structural entry, will not be removed at this point."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:330
+#: lib/pp_admintools/app/mirror_ldap.py:329
 msgid "Removing all structural entries from target LDAP instance."
 msgstr ""
 
@@ -936,7 +936,7 @@ msgstr ""
 msgid "Zone object:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:69
+#: lib/pp_admintools/app/remove_ldap_user.py:68
 msgid ""
 "Disables or removes the given users from LDAP. If disabling, then the user will not be really "
 "removed, but disabled by locking the password, setting all status flags to {inact!r}, assigning "
@@ -944,185 +944,185 @@ msgid ""
 "user will be really removed from LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:114
+#: lib/pp_admintools/app/remove_ldap_user.py:113
 msgid "Removing options"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:117
+#: lib/pp_admintools/app/remove_ldap_user.py:116
 msgid "This is the default."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:118
+#: lib/pp_admintools/app/remove_ldap_user.py:117
 msgid "This is mutually exclusive to {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:120
+#: lib/pp_admintools/app/remove_ldap_user.py:119
 msgid "Deactivating the user instead of removing it."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:127
+#: lib/pp_admintools/app/remove_ldap_user.py:126
 msgid "Removing the user from LDAP."
 msgstr "Removing the user from LDAP."
 
-#: lib/pp_admintools/app/remove_ldap_user.py:135 lib/pp_admintools/app/set_ldap_password.py:273
+#: lib/pp_admintools/app/remove_ldap_user.py:134 lib/pp_admintools/app/set_ldap_password.py:273
 #: lib/pp_admintools/app/set_ldap_password.py:276
 msgid "USER"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:136
+#: lib/pp_admintools/app/remove_ldap_user.py:135
 msgid ""
 "The user, which should be deactivated or removed. They may be given by their Uid (the "
 "alphanumeric POSIX name), their mail address or their LDAP DN (be aware, that this may be "
 "different in the particular LDAP instances)."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:160
+#: lib/pp_admintools/app/remove_ldap_user.py:159
 msgid "No users to remove given."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:173
+#: lib/pp_admintools/app/remove_ldap_user.py:172
 msgid "Checking given instances for admin and read/write access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:180
+#: lib/pp_admintools/app/remove_ldap_user.py:179
 msgid "LDAP instance {!r} not found in configuration."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:188
+#: lib/pp_admintools/app/remove_ldap_user.py:187
 msgid "LDAP instance {!r} has only readonly access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:193
+#: lib/pp_admintools/app/remove_ldap_user.py:192
 msgid "No admin access to LDAP instance {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:210
+#: lib/pp_admintools/app/remove_ldap_user.py:209
 msgid "All given users were not found in any LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:215
+#: lib/pp_admintools/app/remove_ldap_user.py:214
 msgid "Evaluated DNs to remove:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:224
+#: lib/pp_admintools/app/remove_ldap_user.py:223
 msgid "Start disabling user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:226
+#: lib/pp_admintools/app/remove_ldap_user.py:225
 msgid "Start removing user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:230
+#: lib/pp_admintools/app/remove_ldap_user.py:229
 msgid "Start disabling user entries ..."
 msgstr "Start disabling user entries …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:232
+#: lib/pp_admintools/app/remove_ldap_user.py:231
 msgid "Start removing user entries ..."
 msgstr "Start removing user entries …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:247
+#: lib/pp_admintools/app/remove_ldap_user.py:246
 msgid "Do you really want to deactivate the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:249
+#: lib/pp_admintools/app/remove_ldap_user.py:248
 msgid "Do you really want to remove the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:275
+#: lib/pp_admintools/app/remove_ldap_user.py:274
 msgid "Deactivate [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:277
+#: lib/pp_admintools/app/remove_ldap_user.py:276
 msgid "Remove [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:285
+#: lib/pp_admintools/app/remove_ldap_user.py:284
 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:299 lib/pp_admintools/app/set_ldap_password.py:531
+#: lib/pp_admintools/app/remove_ldap_user.py:298 lib/pp_admintools/app/set_ldap_password.py:531
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:306 lib/pp_admintools/app/set_ldap_password.py:536
+#: lib/pp_admintools/app/remove_ldap_user.py:305 lib/pp_admintools/app/set_ldap_password.py:536
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:318 lib/pp_admintools/app/set_ldap_password.py:550
+#: lib/pp_admintools/app/remove_ldap_user.py:317 lib/pp_admintools/app/set_ldap_password.py:550
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:327
+#: lib/pp_admintools/app/remove_ldap_user.py:326
 msgid "Deactivating all given users from {} ..."
 msgstr "Deactivating all given users from {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:329
+#: lib/pp_admintools/app/remove_ldap_user.py:328
 msgid "Removing all given users from {} ..."
 msgstr "Removing all given users from {} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:344
+#: lib/pp_admintools/app/remove_ldap_user.py:343
 msgid "Deactivating user {dn!r} from {inst} ..."
 msgstr "Deactivating user {dn!r} from {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:347
+#: lib/pp_admintools/app/remove_ldap_user.py:346
 msgid "Removing user {dn!r} from {inst} ..."
 msgstr "Removing user {dn!r} from {inst} …"
 
-#: lib/pp_admintools/app/remove_ldap_user.py:353
+#: lib/pp_admintools/app/remove_ldap_user.py:352
 msgid "Attributes of {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:374
+#: lib/pp_admintools/app/remove_ldap_user.py:373
 msgid "{c} on removing user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:380
+#: lib/pp_admintools/app/remove_ldap_user.py:379
 msgid "User {dn!r} successful deactivated on {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:383
+#: lib/pp_admintools/app/remove_ldap_user.py:382
 msgid "User {dn!r} successful removed from {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:409
+#: lib/pp_admintools/app/remove_ldap_user.py:408
 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:414 lib/pp_admintools/app/set_ldap_password.py:610
+#: lib/pp_admintools/app/remove_ldap_user.py:413 lib/pp_admintools/app/set_ldap_password.py:610
 msgid "{c} on deactivating user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:430
+#: lib/pp_admintools/app/remove_ldap_user.py:429
 msgid "Did not found any group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:436 lib/pp_admintools/app/remove_ldap_user.py:463
-#: lib/pp_admintools/app/remove_ldap_user.py:494 lib/pp_admintools/app/remove_ldap_user.py:525
+#: lib/pp_admintools/app/remove_ldap_user.py:435 lib/pp_admintools/app/remove_ldap_user.py:462
+#: lib/pp_admintools/app/remove_ldap_user.py:493 lib/pp_admintools/app/remove_ldap_user.py:524
 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:441 lib/pp_admintools/app/remove_ldap_user.py:468
-#: lib/pp_admintools/app/remove_ldap_user.py:499 lib/pp_admintools/app/remove_ldap_user.py:530
+#: 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 "{c} on removing user {dn!r} from group {g!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:457
+#: lib/pp_admintools/app/remove_ldap_user.py:456
 msgid "Did not found any unique group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:481
+#: lib/pp_admintools/app/remove_ldap_user.py:480
 msgid "Deleting user {uid!r} from all POSIX groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:488
+#: lib/pp_admintools/app/remove_ldap_user.py:487
 msgid "Did not found any POSIX group memberships of {uid!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:512
+#: lib/pp_admintools/app/remove_ldap_user.py:511
 msgid "Deleting user {uid!r} from all sudo groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:519
+#: lib/pp_admintools/app/remove_ldap_user.py:518
 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 dfc7476a89a8582838c1395ffa7dfc663f133d50..55971170407dac9cf1471092aeab8682acdc681e 100644 (file)
--- a/locale/pp_admintools.pot
+++ b/locale/pp_admintools.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pp_admintools 0.9.1\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2022-10-20 17:39+0200\n"
+"POT-Creation-Date: 2022-10-20 17:42+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"
@@ -321,8 +321,8 @@ msgstr ""
 msgid "Options fo LDAP connections"
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:327 lib/pp_admintools/app/mirror_ldap.py:216
-#: lib/pp_admintools/app/remove_ldap_user.py:279 lib/pp_admintools/app/set_ldap_password.py:583
+#: lib/pp_admintools/app/ldap.py:327 lib/pp_admintools/app/mirror_ldap.py:215
+#: lib/pp_admintools/app/remove_ldap_user.py:278 lib/pp_admintools/app/set_ldap_password.py:583
 msgid "No"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgid ""
 "are shown, and the application is exiting."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:429 lib/pp_admintools/app/mirror_ldap.py:108
+#: lib/pp_admintools/app/ldap.py:429 lib/pp_admintools/app/mirror_ldap.py:107
 msgid "SECONDS"
 msgstr ""
 
@@ -516,7 +516,7 @@ msgstr ""
 msgid "Trying to evaluate DN of user {u!r} as a UID (Posix user name) ..."
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:872 lib/pp_admintools/app/remove_ldap_user.py:289
+#: lib/pp_admintools/app/ldap.py:872 lib/pp_admintools/app/remove_ldap_user.py:288
 msgid "Empty user given."
 msgstr ""
 
@@ -591,9 +591,9 @@ msgstr ""
 msgid "Modification NOT successfull - {c}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/ldap.py:1171 lib/pp_admintools/app/remove_ldap_user.py:416
-#: lib/pp_admintools/app/remove_ldap_user.py:443 lib/pp_admintools/app/remove_ldap_user.py:470
-#: lib/pp_admintools/app/remove_ldap_user.py:501 lib/pp_admintools/app/remove_ldap_user.py:532
+#: lib/pp_admintools/app/ldap.py:1171 lib/pp_admintools/app/remove_ldap_user.py:415
+#: 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/set_ldap_password.py:612
 msgid "Changes:"
 msgstr ""
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Did not found sendmail executable."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:87
+#: lib/pp_admintools/app/mirror_ldap.py:86
 msgid ""
 "Mirror the content of a complete LDAP instance (server or cluster) to another instance. This "
 "will be done first by clearing the target instance, then copying structural entries from the "
@@ -736,105 +736,105 @@ msgid ""
 "values."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:95
+#: lib/pp_admintools/app/mirror_ldap.py:94
 msgid "Do not execute a countdown before starting the application."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:105
+#: lib/pp_admintools/app/mirror_ldap.py:104
 msgid "Miroring options"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:110
+#: lib/pp_admintools/app/mirror_ldap.py:109
 msgid ""
 "Number of seconds to wait after each write operation. Given as a float value, and if set to "
 "zero, there is no waiting after a write. (default: {:.1f})"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:117
+#: lib/pp_admintools/app/mirror_ldap.py:116
 msgid "NUMBER"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:119
+#: lib/pp_admintools/app/mirror_ldap.py:118
 msgid "Limiting the mirroring to the first NUMBER entries. This option is valid only in simulation mode."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:126
+#: lib/pp_admintools/app/mirror_ldap.py:125
 msgid "Mirror only structural entries (entries with childs)."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:148
+#: lib/pp_admintools/app/mirror_ldap.py:147
 msgid "Limiting the number of entries for mirroring to {} entries."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:152
+#: lib/pp_admintools/app/mirror_ldap.py:151
 msgid "Limition the number of entries for mirroring may only be done in simulation mode."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:168
+#: lib/pp_admintools/app/mirror_ldap.py:167
 msgid "Checking mirror source instance for target instance {!r} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:172
+#: lib/pp_admintools/app/mirror_ldap.py:171
 msgid "Got {!r} as the mirror source instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:175 lib/pp_admintools/app/mirror_ldap.py:184
-#: lib/pp_admintools/app/mirror_ldap.py:195
+#: lib/pp_admintools/app/mirror_ldap.py:174 lib/pp_admintools/app/mirror_ldap.py:183
+#: lib/pp_admintools/app/mirror_ldap.py:194
 msgid "Error in configuration:"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:176
+#: lib/pp_admintools/app/mirror_ldap.py:175
 msgid "the source LDAP instance {src!r} for mirroring to {tgt!r} does not exists."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:185
+#: lib/pp_admintools/app/mirror_ldap.py:184
 msgid "the source LDAP instance {src!r} must not be the same like the target instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:196
+#: lib/pp_admintools/app/mirror_ldap.py:195
 msgid ""
 "the base DN {src_dn!r} of the source instance {src!r} does not match the base DN {tgt_dn!r} of "
 "the target instance {tgt!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:212
+#: lib/pp_admintools/app/mirror_ldap.py:211
 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:216 lib/pp_admintools/app/remove_ldap_user.py:279
+#: lib/pp_admintools/app/mirror_ldap.py:215 lib/pp_admintools/app/remove_ldap_user.py:278
 #: lib/pp_admintools/app/set_ldap_password.py:583
 msgid "yes"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:222 lib/pp_admintools/app/mirror_ldap.py:240
+#: lib/pp_admintools/app/mirror_ldap.py:221 lib/pp_admintools/app/mirror_ldap.py:239
 msgid "Interrupted on demand."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:227
+#: lib/pp_admintools/app/mirror_ldap.py:226
 msgid "Start mirroring LDAP instance {src!r} ({src_url}) to instance {tgt!r} ({tgt_url}) ..."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:240
+#: lib/pp_admintools/app/mirror_ldap.py:239
 msgid "Got a {}:"
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:249
+#: lib/pp_admintools/app/mirror_ldap.py:248
 msgid "Removing all existing entries in target LDAP instance (except the base DN entry, of course)."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:261
+#: lib/pp_admintools/app/mirror_ldap.py:260
 msgid "Trying to get DNs of all entries in the target LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:302
+#: lib/pp_admintools/app/mirror_ldap.py:301
 msgid "Removing all non structural entries from target LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:314
+#: lib/pp_admintools/app/mirror_ldap.py:313
 msgid "Entry {!r} is a structural entry, will not be removed at this point."
 msgstr ""
 
-#: lib/pp_admintools/app/mirror_ldap.py:330
+#: lib/pp_admintools/app/mirror_ldap.py:329
 msgid "Removing all structural entries from target LDAP instance."
 msgstr ""
 
@@ -934,7 +934,7 @@ msgstr ""
 msgid "Zone object:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:69
+#: lib/pp_admintools/app/remove_ldap_user.py:68
 msgid ""
 "Disables or removes the given users from LDAP. If disabling, then the user will not be really "
 "removed, but disabled by locking the password, setting all status flags to {inact!r}, assigning "
@@ -942,185 +942,185 @@ msgid ""
 "user will be really removed from LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:114
+#: lib/pp_admintools/app/remove_ldap_user.py:113
 msgid "Removing options"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:117
+#: lib/pp_admintools/app/remove_ldap_user.py:116
 msgid "This is the default."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:118
+#: lib/pp_admintools/app/remove_ldap_user.py:117
 msgid "This is mutually exclusive to {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:120
+#: lib/pp_admintools/app/remove_ldap_user.py:119
 msgid "Deactivating the user instead of removing it."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:127
+#: lib/pp_admintools/app/remove_ldap_user.py:126
 msgid "Removing the user from LDAP."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:135 lib/pp_admintools/app/set_ldap_password.py:273
+#: lib/pp_admintools/app/remove_ldap_user.py:134 lib/pp_admintools/app/set_ldap_password.py:273
 #: lib/pp_admintools/app/set_ldap_password.py:276
 msgid "USER"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:136
+#: lib/pp_admintools/app/remove_ldap_user.py:135
 msgid ""
 "The user, which should be deactivated or removed. They may be given by their Uid (the "
 "alphanumeric POSIX name), their mail address or their LDAP DN (be aware, that this may be "
 "different in the particular LDAP instances)."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:160
+#: lib/pp_admintools/app/remove_ldap_user.py:159
 msgid "No users to remove given."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:173
+#: lib/pp_admintools/app/remove_ldap_user.py:172
 msgid "Checking given instances for admin and read/write access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:180
+#: lib/pp_admintools/app/remove_ldap_user.py:179
 msgid "LDAP instance {!r} not found in configuration."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:188
+#: lib/pp_admintools/app/remove_ldap_user.py:187
 msgid "LDAP instance {!r} has only readonly access."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:193
+#: lib/pp_admintools/app/remove_ldap_user.py:192
 msgid "No admin access to LDAP instance {!r}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:210
+#: lib/pp_admintools/app/remove_ldap_user.py:209
 msgid "All given users were not found in any LDAP instance."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:215
+#: lib/pp_admintools/app/remove_ldap_user.py:214
 msgid "Evaluated DNs to remove:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:224
+#: lib/pp_admintools/app/remove_ldap_user.py:223
 msgid "Start disabling user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:226
+#: lib/pp_admintools/app/remove_ldap_user.py:225
 msgid "Start removing user entries in:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:230
+#: lib/pp_admintools/app/remove_ldap_user.py:229
 msgid "Start disabling user entries ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:232
+#: lib/pp_admintools/app/remove_ldap_user.py:231
 msgid "Start removing user entries ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:247
+#: lib/pp_admintools/app/remove_ldap_user.py:246
 msgid "Do you really want to deactivate the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:249
+#: lib/pp_admintools/app/remove_ldap_user.py:248
 msgid "Do you really want to remove the following users?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:275
+#: lib/pp_admintools/app/remove_ldap_user.py:274
 msgid "Deactivate [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:277
+#: lib/pp_admintools/app/remove_ldap_user.py:276
 msgid "Remove [{yes}/{no}]?"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:285
+#: lib/pp_admintools/app/remove_ldap_user.py:284
 msgid "Evaluating DNs of the user {!r} to remove ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:299 lib/pp_admintools/app/set_ldap_password.py:531
+#: lib/pp_admintools/app/remove_ldap_user.py:298 lib/pp_admintools/app/set_ldap_password.py:531
 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:306 lib/pp_admintools/app/set_ldap_password.py:536
+#: lib/pp_admintools/app/remove_ldap_user.py:305 lib/pp_admintools/app/set_ldap_password.py:536
 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:318 lib/pp_admintools/app/set_ldap_password.py:550
+#: lib/pp_admintools/app/remove_ldap_user.py:317 lib/pp_admintools/app/set_ldap_password.py:550
 msgid "Did not found user {user!r} in LDAP instance {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:327
+#: lib/pp_admintools/app/remove_ldap_user.py:326
 msgid "Deactivating all given users from {} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:329
+#: lib/pp_admintools/app/remove_ldap_user.py:328
 msgid "Removing all given users from {} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:344
+#: lib/pp_admintools/app/remove_ldap_user.py:343
 msgid "Deactivating user {dn!r} from {inst} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:347
+#: lib/pp_admintools/app/remove_ldap_user.py:346
 msgid "Removing user {dn!r} from {inst} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:353
+#: lib/pp_admintools/app/remove_ldap_user.py:352
 msgid "Attributes of {!r}:"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:374
+#: lib/pp_admintools/app/remove_ldap_user.py:373
 msgid "{c} on removing user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:380
+#: lib/pp_admintools/app/remove_ldap_user.py:379
 msgid "User {dn!r} successful deactivated on {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:383
+#: lib/pp_admintools/app/remove_ldap_user.py:382
 msgid "User {dn!r} successful removed from {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:409
+#: lib/pp_admintools/app/remove_ldap_user.py:408
 msgid "Updating user info for {dn!r} on {inst} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:414 lib/pp_admintools/app/set_ldap_password.py:610
+#: lib/pp_admintools/app/remove_ldap_user.py:413 lib/pp_admintools/app/set_ldap_password.py:610
 msgid "{c} on deactivating user {dn!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:430
+#: lib/pp_admintools/app/remove_ldap_user.py:429
 msgid "Did not found any group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:436 lib/pp_admintools/app/remove_ldap_user.py:463
-#: lib/pp_admintools/app/remove_ldap_user.py:494 lib/pp_admintools/app/remove_ldap_user.py:525
+#: lib/pp_admintools/app/remove_ldap_user.py:435 lib/pp_admintools/app/remove_ldap_user.py:462
+#: lib/pp_admintools/app/remove_ldap_user.py:493 lib/pp_admintools/app/remove_ldap_user.py:524
 msgid "Removing user {u!r} from group {g!r} ..."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:441 lib/pp_admintools/app/remove_ldap_user.py:468
-#: lib/pp_admintools/app/remove_ldap_user.py:499 lib/pp_admintools/app/remove_ldap_user.py:530
+#: 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 "{c} on removing user {dn!r} from group {g!r}: {e}"
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:457
+#: lib/pp_admintools/app/remove_ldap_user.py:456
 msgid "Did not found any unique group memberships of {dn!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:481
+#: lib/pp_admintools/app/remove_ldap_user.py:480
 msgid "Deleting user {uid!r} from all POSIX groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:488
+#: lib/pp_admintools/app/remove_ldap_user.py:487
 msgid "Did not found any POSIX group memberships of {uid!r} in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:512
+#: lib/pp_admintools/app/remove_ldap_user.py:511
 msgid "Deleting user {uid!r} from all sudo groups in {inst}."
 msgstr ""
 
-#: lib/pp_admintools/app/remove_ldap_user.py:519
+#: lib/pp_admintools/app/remove_ldap_user.py:518
 msgid "Did not found any sudo group memberships of {uid!r} in {inst}."
 msgstr ""