From 28fdebcdd7e5364fd6f670d885217174a825461f Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 19 Sep 2022 14:10:32 +0200 Subject: [PATCH] Changing defaults in remove-ldap-user. --- lib/pp_admintools/app/remove_ldap_user.py | 26 ++--- locale/de_DE/LC_MESSAGES/pp_admintools.po | 110 ++++++++++++---------- locale/en_US/LC_MESSAGES/pp_admintools.po | 107 +++++++++++---------- locale/pp_admintools.pot | 104 ++++++++++---------- 4 files changed, 187 insertions(+), 160 deletions(-) diff --git a/lib/pp_admintools/app/remove_ldap_user.py b/lib/pp_admintools/app/remove_ldap_user.py index d90c562..f94f799 100644 --- a/lib/pp_admintools/app/remove_ldap_user.py +++ b/lib/pp_admintools/app/remove_ldap_user.py @@ -25,7 +25,7 @@ from . import AbortAppError, TimeoutOnPromptError from .ldap import LdapAppError, FatalLDAPError from .ldap import BaseLdapApplication -__version__ = '0.5.2' +__version__ = '0.5.3' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -61,7 +61,7 @@ class RemoveLdapUserApplication(BaseLdapApplication): self.given_users = [] self.nologin_shell = self.default_nologin_shell - self._deactivate = False + self._deactivate = True self.shadow_expire = int(time.time() / 3600 / 24) - 100 @@ -115,20 +115,22 @@ class RemoveLdapUserApplication(BaseLdapApplication): remove_group = self.arg_parser.add_argument_group(_('Removing options')) remove_mode_group = remove_group.add_mutually_exclusive_group() + help_default = ' ' + _("This is the default.") + help_mutual = " " + _("This is mutually exclusive to {!r}.") + help_txt = _("Deactivating the user instead of removing it.") + help_txt += help_mutual.format('--remove') + if self.deactivate: + help_txt += help_default remove_mode_group.add_argument( - '-d', '--deactivate', dest="deactivate", action='store_true', - help=_( - "Deactivating the user instead of removing it. " - "This is mutually exclusive to {!r}.").format('--remove'), - ) + '-d', '--deactivate', dest="deactivate", action='store_true', help=help_txt) + help_txt = _("Removing the user from LDAP.") + help_txt += help_mutual.format('--deactivate') + if not self.deactivate: + help_txt += help_default remove_mode_group.add_argument( - '-R', '--remove', dest="deactivate", action='store_false', - help=_( - "Removing the user from LDAP. This is the default and is " - "mutually exclusive to {!r}.").format('--deactivate'), - ) + '-R', '--remove', dest="deactivate", action='store_false', help=help_txt) remove_group.add_argument( 'users', nargs='*', metavar=_('USER'), diff --git a/locale/de_DE/LC_MESSAGES/pp_admintools.po b/locale/de_DE/LC_MESSAGES/pp_admintools.po index 6c91926..7657b8f 100644 --- 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.9.1\n" "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n" -"POT-Creation-Date: 2022-09-09 11:58+0200\n" -"PO-Revision-Date: 2022-09-09 11:45+0200\n" +"POT-Creation-Date: 2022-09-19 14:05+0200\n" +"PO-Revision-Date: 2022-09-19 14:15+0200\n" "Last-Translator: Frank Brehm \n" "Language: de_DE\n" "Language-Team: de_DE \n" @@ -30,7 +30,7 @@ msgstr "Ein iTimeout muss größer als Null und kleiner oder gleich {} sein." msgid "Wrong timeout {!r}:" msgstr "Ungültiger Timeout {!r}:" -#: lib/pp_admintools/app/__init__.py:125 lib/pp_admintools/app/remove_ldap_user.py:238 +#: lib/pp_admintools/app/__init__.py:125 lib/pp_admintools/app/remove_ldap_user.py:240 msgid "yes" msgstr "ja" @@ -357,7 +357,7 @@ 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:267 lib/pp_admintools/app/remove_ldap_user.py:238 +#: lib/pp_admintools/app/ldap.py:267 lib/pp_admintools/app/remove_ldap_user.py:240 msgid "No" msgstr "Nein" @@ -532,7 +532,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:640 lib/pp_admintools/app/remove_ldap_user.py:258 +#: lib/pp_admintools/app/ldap.py:640 lib/pp_admintools/app/remove_ldap_user.py:260 msgid "Empty user given." msgstr "Leere Nutzername übergeben." @@ -614,9 +614,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:938 lib/pp_admintools/app/remove_ldap_user.py:385 -#: lib/pp_admintools/app/remove_ldap_user.py:412 lib/pp_admintools/app/remove_ldap_user.py:439 -#: lib/pp_admintools/app/remove_ldap_user.py:470 lib/pp_admintools/app/remove_ldap_user.py:501 +#: lib/pp_admintools/app/ldap.py:938 lib/pp_admintools/app/remove_ldap_user.py:387 +#: lib/pp_admintools/app/remove_ldap_user.py:414 lib/pp_admintools/app/remove_ldap_user.py:441 +#: lib/pp_admintools/app/remove_ldap_user.py:472 lib/pp_admintools/app/remove_ldap_user.py:503 msgid "Changes:" msgstr "Änderungen:" @@ -875,19 +875,27 @@ msgstr "" msgid "Removing options" msgstr "Lösch-Optionen" +#: lib/pp_admintools/app/remove_ldap_user.py:118 +msgid "This is the default." +msgstr "Dieses ist die Vorgabe." + +#: lib/pp_admintools/app/remove_ldap_user.py:119 +msgid "This is mutually exclusive to {!r}." +msgstr "Das schließt sich mit {!r} gegenseitig aus." + #: lib/pp_admintools/app/remove_ldap_user.py:121 -msgid "Deactivating the user instead of removing it. This is mutually exclusive to {!r}." -msgstr "Deaktivieren der Nutzer anstatt Löschung. Das schließt sich mit {!r} gegenseitig aus." +msgid "Deactivating the user instead of removing it." +msgstr "Deaktivieren der Nutzer anstatt Löschung." #: lib/pp_admintools/app/remove_ldap_user.py:128 -msgid "Removing the user from LDAP. This is the default and is mutually exclusive to {!r}." -msgstr "Löschen der Nutzer im LDAP. Dieses ist die Vorgabe und schließt sich mit {!r} gegenseitig aus." +msgid "Removing the user from LDAP." +msgstr "Löschen der übergebenen Nutzer im LDAP." -#: lib/pp_admintools/app/remove_ldap_user.py:134 +#: lib/pp_admintools/app/remove_ldap_user.py:136 msgid "USER" msgstr "NUTZER" -#: lib/pp_admintools/app/remove_ldap_user.py:135 +#: lib/pp_admintools/app/remove_ldap_user.py:137 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 " @@ -898,145 +906,145 @@ msgstr "" "angegeben werden. Bitte beachten, dass sich letzterer bei den verschiedenen LDAP-Instanzen " "unterscheiden kann." -#: lib/pp_admintools/app/remove_ldap_user.py:152 +#: lib/pp_admintools/app/remove_ldap_user.py:154 msgid "No users to remove given." msgstr "Kein Nutzername zum Löschen angegeben." -#: lib/pp_admintools/app/remove_ldap_user.py:169 +#: lib/pp_admintools/app/remove_ldap_user.py:171 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:174 +#: lib/pp_admintools/app/remove_ldap_user.py:176 msgid "Evaluated DNs to remove:" msgstr "Zum Löschen ermittelte DNs:" -#: lib/pp_admintools/app/remove_ldap_user.py:183 +#: lib/pp_admintools/app/remove_ldap_user.py:185 msgid "Start disabling user entries in:" msgstr "Beginne Deaktivierung der Nutzereinträge in:" -#: lib/pp_admintools/app/remove_ldap_user.py:185 +#: lib/pp_admintools/app/remove_ldap_user.py:187 msgid "Start removing user entries in:" msgstr "Beginne Löschung der Nutzereinträge in:" -#: lib/pp_admintools/app/remove_ldap_user.py:189 +#: lib/pp_admintools/app/remove_ldap_user.py:191 msgid "Start disabling user entries ..." msgstr "Beginne Deaktivierung der Nutzereinträge …" -#: lib/pp_admintools/app/remove_ldap_user.py:191 +#: lib/pp_admintools/app/remove_ldap_user.py:193 msgid "Start removing user entries ..." msgstr "Beginne Löschung der Nutzereinträge …" -#: lib/pp_admintools/app/remove_ldap_user.py:206 +#: lib/pp_admintools/app/remove_ldap_user.py:208 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:208 +#: lib/pp_admintools/app/remove_ldap_user.py:210 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:234 +#: lib/pp_admintools/app/remove_ldap_user.py:236 msgid "Deactivate [{yes}/{no}]?" msgstr "Deaktivieren [{yes}/{no}]?" -#: lib/pp_admintools/app/remove_ldap_user.py:236 +#: lib/pp_admintools/app/remove_ldap_user.py:238 msgid "Remove [{yes}/{no}]?" msgstr "Löschen [{yes}/{no}]?" -#: lib/pp_admintools/app/remove_ldap_user.py:243 +#: lib/pp_admintools/app/remove_ldap_user.py:245 msgid "Abort deactivating by {cls}: {e}" msgstr "Abbruch der Deaktivierung durch {cls}: {e}" -#: lib/pp_admintools/app/remove_ldap_user.py:245 +#: lib/pp_admintools/app/remove_ldap_user.py:247 msgid "Abort removing by {cls}: {e}" msgstr "Abbruch des Löschens durch {cls}: {e}" -#: lib/pp_admintools/app/remove_ldap_user.py:254 +#: lib/pp_admintools/app/remove_ldap_user.py:256 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:268 +#: lib/pp_admintools/app/remove_ldap_user.py:270 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:275 +#: lib/pp_admintools/app/remove_ldap_user.py:277 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:287 +#: lib/pp_admintools/app/remove_ldap_user.py:289 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:296 +#: lib/pp_admintools/app/remove_ldap_user.py:298 msgid "Deactivating all given users from {} ..." msgstr "Deaktivieren aller übergebenen Nutzer in {} …" -#: lib/pp_admintools/app/remove_ldap_user.py:298 +#: lib/pp_admintools/app/remove_ldap_user.py:300 msgid "Removing all given users from {} ..." msgstr "Lösche alle übergebenen Nutzer in {} …" -#: lib/pp_admintools/app/remove_ldap_user.py:313 +#: lib/pp_admintools/app/remove_ldap_user.py:315 msgid "Deactivating user {dn!r} from {inst} ..." msgstr "Deaktivieren von Nutzer {dn!r} in {inst} …" -#: lib/pp_admintools/app/remove_ldap_user.py:316 +#: lib/pp_admintools/app/remove_ldap_user.py:318 msgid "Removing user {dn!r} from {inst} ..." msgstr "Lösche Nutzer {dn!r} in {inst} …" -#: lib/pp_admintools/app/remove_ldap_user.py:322 +#: lib/pp_admintools/app/remove_ldap_user.py:324 msgid "Attributes of {!r}:" msgstr "Attribute von {!r}:" -#: lib/pp_admintools/app/remove_ldap_user.py:343 +#: lib/pp_admintools/app/remove_ldap_user.py:345 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:349 +#: lib/pp_admintools/app/remove_ldap_user.py:351 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:352 +#: lib/pp_admintools/app/remove_ldap_user.py:354 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:378 +#: lib/pp_admintools/app/remove_ldap_user.py:380 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:383 +#: lib/pp_admintools/app/remove_ldap_user.py:385 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:399 +#: lib/pp_admintools/app/remove_ldap_user.py:401 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:405 lib/pp_admintools/app/remove_ldap_user.py:432 -#: 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:407 lib/pp_admintools/app/remove_ldap_user.py:434 +#: lib/pp_admintools/app/remove_ldap_user.py:465 lib/pp_admintools/app/remove_ldap_user.py:496 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:410 lib/pp_admintools/app/remove_ldap_user.py:437 -#: 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:412 lib/pp_admintools/app/remove_ldap_user.py:439 +#: lib/pp_admintools/app/remove_ldap_user.py:470 lib/pp_admintools/app/remove_ldap_user.py:501 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:426 +#: lib/pp_admintools/app/remove_ldap_user.py:428 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:450 +#: lib/pp_admintools/app/remove_ldap_user.py:452 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:457 +#: lib/pp_admintools/app/remove_ldap_user.py:459 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:481 +#: lib/pp_admintools/app/remove_ldap_user.py:483 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:488 +#: lib/pp_admintools/app/remove_ldap_user.py:490 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 cec83fe..0d5616b 100644 --- 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-09-09 11:58+0200\n" +"POT-Creation-Date: 2022-09-19 14:05+0200\n" "PO-Revision-Date: 2022-09-09 11:40+0200\n" "Last-Translator: Frank Brehm \n" "Language: en_US\n" @@ -30,7 +30,7 @@ msgstr "" msgid "Wrong timeout {!r}:" msgstr "" -#: lib/pp_admintools/app/__init__.py:125 lib/pp_admintools/app/remove_ldap_user.py:238 +#: lib/pp_admintools/app/__init__.py:125 lib/pp_admintools/app/remove_ldap_user.py:240 msgid "yes" msgstr "" @@ -351,7 +351,7 @@ msgstr "" msgid "Options fo LDAP connections" msgstr "" -#: lib/pp_admintools/app/ldap.py:267 lib/pp_admintools/app/remove_ldap_user.py:238 +#: lib/pp_admintools/app/ldap.py:267 lib/pp_admintools/app/remove_ldap_user.py:240 msgid "No" 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:640 lib/pp_admintools/app/remove_ldap_user.py:258 +#: lib/pp_admintools/app/ldap.py:640 lib/pp_admintools/app/remove_ldap_user.py:260 msgid "Empty user given." msgstr "" @@ -599,9 +599,9 @@ msgstr "" msgid "Modification NOT successfull - {c}: {e}" msgstr "" -#: lib/pp_admintools/app/ldap.py:938 lib/pp_admintools/app/remove_ldap_user.py:385 -#: lib/pp_admintools/app/remove_ldap_user.py:412 lib/pp_admintools/app/remove_ldap_user.py:439 -#: lib/pp_admintools/app/remove_ldap_user.py:470 lib/pp_admintools/app/remove_ldap_user.py:501 +#: lib/pp_admintools/app/ldap.py:938 lib/pp_admintools/app/remove_ldap_user.py:387 +#: lib/pp_admintools/app/remove_ldap_user.py:414 lib/pp_admintools/app/remove_ldap_user.py:441 +#: lib/pp_admintools/app/remove_ldap_user.py:472 lib/pp_admintools/app/remove_ldap_user.py:503 msgid "Changes:" msgstr "" @@ -850,164 +850,173 @@ msgstr "" msgid "Removing options" msgstr "" +#: lib/pp_admintools/app/remove_ldap_user.py:118 +msgid "This is the default." +msgstr "" + +#: lib/pp_admintools/app/remove_ldap_user.py:119 +msgid "This is mutually exclusive to {!r}." +msgstr "" + #: lib/pp_admintools/app/remove_ldap_user.py:121 -msgid "Deactivating the user instead of removing it. This is mutually exclusive to {!r}." +msgid "Deactivating the user instead of removing it." msgstr "" #: lib/pp_admintools/app/remove_ldap_user.py:128 -msgid "Removing the user from LDAP. This is the default and is mutually exclusive to {!r}." -msgstr "" +#, fuzzy +msgid "Removing the user from LDAP." +msgstr "Removing all given users from {} …" -#: lib/pp_admintools/app/remove_ldap_user.py:134 +#: lib/pp_admintools/app/remove_ldap_user.py:136 msgid "USER" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:135 +#: lib/pp_admintools/app/remove_ldap_user.py:137 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:152 +#: lib/pp_admintools/app/remove_ldap_user.py:154 msgid "No users to remove given." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:169 +#: lib/pp_admintools/app/remove_ldap_user.py:171 msgid "All given users were not found in any LDAP instance." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:174 +#: lib/pp_admintools/app/remove_ldap_user.py:176 msgid "Evaluated DNs to remove:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:183 +#: lib/pp_admintools/app/remove_ldap_user.py:185 msgid "Start disabling user entries in:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:185 +#: lib/pp_admintools/app/remove_ldap_user.py:187 msgid "Start removing user entries in:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:189 +#: lib/pp_admintools/app/remove_ldap_user.py:191 msgid "Start disabling user entries ..." msgstr "Start disabling user entries …" -#: lib/pp_admintools/app/remove_ldap_user.py:191 +#: lib/pp_admintools/app/remove_ldap_user.py:193 msgid "Start removing user entries ..." msgstr "Start removing user entries …" -#: lib/pp_admintools/app/remove_ldap_user.py:206 +#: lib/pp_admintools/app/remove_ldap_user.py:208 msgid "Do you really want to deactivate the following users?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:208 +#: lib/pp_admintools/app/remove_ldap_user.py:210 msgid "Do you really want to remove the following users?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:234 +#: lib/pp_admintools/app/remove_ldap_user.py:236 msgid "Deactivate [{yes}/{no}]?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:236 +#: lib/pp_admintools/app/remove_ldap_user.py:238 msgid "Remove [{yes}/{no}]?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:243 +#: lib/pp_admintools/app/remove_ldap_user.py:245 msgid "Abort deactivating by {cls}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:245 +#: lib/pp_admintools/app/remove_ldap_user.py:247 msgid "Abort removing by {cls}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:254 +#: lib/pp_admintools/app/remove_ldap_user.py:256 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:268 +#: lib/pp_admintools/app/remove_ldap_user.py:270 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:275 +#: lib/pp_admintools/app/remove_ldap_user.py:277 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:287 +#: lib/pp_admintools/app/remove_ldap_user.py:289 msgid "Did not found user {user!r} in LDAP instance {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:296 +#: lib/pp_admintools/app/remove_ldap_user.py:298 msgid "Deactivating all given users from {} ..." msgstr "Deactivating all given users from {} …" -#: lib/pp_admintools/app/remove_ldap_user.py:298 +#: lib/pp_admintools/app/remove_ldap_user.py:300 msgid "Removing all given users from {} ..." msgstr "Removing all given users from {} …" -#: lib/pp_admintools/app/remove_ldap_user.py:313 +#: lib/pp_admintools/app/remove_ldap_user.py:315 msgid "Deactivating user {dn!r} from {inst} ..." msgstr "Deactivating user {dn!r} from {inst} …" -#: lib/pp_admintools/app/remove_ldap_user.py:316 +#: lib/pp_admintools/app/remove_ldap_user.py:318 msgid "Removing user {dn!r} from {inst} ..." msgstr "Removing user {dn!r} from {inst} …" -#: lib/pp_admintools/app/remove_ldap_user.py:322 +#: lib/pp_admintools/app/remove_ldap_user.py:324 msgid "Attributes of {!r}:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:343 +#: lib/pp_admintools/app/remove_ldap_user.py:345 msgid "{c} on removing user {dn!r}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:349 +#: lib/pp_admintools/app/remove_ldap_user.py:351 msgid "User {dn!r} successful deactivated on {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:352 +#: lib/pp_admintools/app/remove_ldap_user.py:354 msgid "User {dn!r} successful removed from {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:378 +#: lib/pp_admintools/app/remove_ldap_user.py:380 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:383 +#: lib/pp_admintools/app/remove_ldap_user.py:385 msgid "{c} on deactivating user {dn!r}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:399 +#: lib/pp_admintools/app/remove_ldap_user.py:401 msgid "Did not found any group memberships of {dn!r} in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:405 lib/pp_admintools/app/remove_ldap_user.py:432 -#: 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:407 lib/pp_admintools/app/remove_ldap_user.py:434 +#: lib/pp_admintools/app/remove_ldap_user.py:465 lib/pp_admintools/app/remove_ldap_user.py:496 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:410 lib/pp_admintools/app/remove_ldap_user.py:437 -#: 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:412 lib/pp_admintools/app/remove_ldap_user.py:439 +#: lib/pp_admintools/app/remove_ldap_user.py:470 lib/pp_admintools/app/remove_ldap_user.py:501 msgid "{c} on removing user {dn!r} from group {g!r}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:426 +#: lib/pp_admintools/app/remove_ldap_user.py:428 msgid "Did not found any unique group memberships of {dn!r} in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:450 +#: lib/pp_admintools/app/remove_ldap_user.py:452 msgid "Deleting user {uid!r} from all POSIX groups in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:457 +#: lib/pp_admintools/app/remove_ldap_user.py:459 msgid "Did not found any POSIX group memberships of {uid!r} in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:481 +#: lib/pp_admintools/app/remove_ldap_user.py:483 msgid "Deleting user {uid!r} from all sudo groups in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:488 +#: lib/pp_admintools/app/remove_ldap_user.py:490 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 c6d5e49..d58d19b 100644 --- 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-09-09 11:58+0200\n" +"POT-Creation-Date: 2022-09-19 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ msgstr "" msgid "Wrong timeout {!r}:" msgstr "" -#: lib/pp_admintools/app/__init__.py:125 lib/pp_admintools/app/remove_ldap_user.py:238 +#: lib/pp_admintools/app/__init__.py:125 lib/pp_admintools/app/remove_ldap_user.py:240 msgid "yes" msgstr "" @@ -350,7 +350,7 @@ msgstr "" msgid "Options fo LDAP connections" msgstr "" -#: lib/pp_admintools/app/ldap.py:267 lib/pp_admintools/app/remove_ldap_user.py:238 +#: lib/pp_admintools/app/ldap.py:267 lib/pp_admintools/app/remove_ldap_user.py:240 msgid "No" 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:640 lib/pp_admintools/app/remove_ldap_user.py:258 +#: lib/pp_admintools/app/ldap.py:640 lib/pp_admintools/app/remove_ldap_user.py:260 msgid "Empty user given." msgstr "" @@ -598,9 +598,9 @@ msgstr "" msgid "Modification NOT successfull - {c}: {e}" msgstr "" -#: lib/pp_admintools/app/ldap.py:938 lib/pp_admintools/app/remove_ldap_user.py:385 -#: lib/pp_admintools/app/remove_ldap_user.py:412 lib/pp_admintools/app/remove_ldap_user.py:439 -#: lib/pp_admintools/app/remove_ldap_user.py:470 lib/pp_admintools/app/remove_ldap_user.py:501 +#: lib/pp_admintools/app/ldap.py:938 lib/pp_admintools/app/remove_ldap_user.py:387 +#: lib/pp_admintools/app/remove_ldap_user.py:414 lib/pp_admintools/app/remove_ldap_user.py:441 +#: lib/pp_admintools/app/remove_ldap_user.py:472 lib/pp_admintools/app/remove_ldap_user.py:503 msgid "Changes:" msgstr "" @@ -849,164 +849,172 @@ msgstr "" msgid "Removing options" msgstr "" +#: lib/pp_admintools/app/remove_ldap_user.py:118 +msgid "This is the default." +msgstr "" + +#: lib/pp_admintools/app/remove_ldap_user.py:119 +msgid "This is mutually exclusive to {!r}." +msgstr "" + #: lib/pp_admintools/app/remove_ldap_user.py:121 -msgid "Deactivating the user instead of removing it. This is mutually exclusive to {!r}." +msgid "Deactivating the user instead of removing it." msgstr "" #: lib/pp_admintools/app/remove_ldap_user.py:128 -msgid "Removing the user from LDAP. This is the default and is mutually exclusive to {!r}." +msgid "Removing the user from LDAP." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:134 +#: lib/pp_admintools/app/remove_ldap_user.py:136 msgid "USER" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:135 +#: lib/pp_admintools/app/remove_ldap_user.py:137 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:152 +#: lib/pp_admintools/app/remove_ldap_user.py:154 msgid "No users to remove given." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:169 +#: lib/pp_admintools/app/remove_ldap_user.py:171 msgid "All given users were not found in any LDAP instance." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:174 +#: lib/pp_admintools/app/remove_ldap_user.py:176 msgid "Evaluated DNs to remove:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:183 +#: lib/pp_admintools/app/remove_ldap_user.py:185 msgid "Start disabling user entries in:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:185 +#: lib/pp_admintools/app/remove_ldap_user.py:187 msgid "Start removing user entries in:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:189 +#: lib/pp_admintools/app/remove_ldap_user.py:191 msgid "Start disabling user entries ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:191 +#: lib/pp_admintools/app/remove_ldap_user.py:193 msgid "Start removing user entries ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:206 +#: lib/pp_admintools/app/remove_ldap_user.py:208 msgid "Do you really want to deactivate the following users?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:208 +#: lib/pp_admintools/app/remove_ldap_user.py:210 msgid "Do you really want to remove the following users?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:234 +#: lib/pp_admintools/app/remove_ldap_user.py:236 msgid "Deactivate [{yes}/{no}]?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:236 +#: lib/pp_admintools/app/remove_ldap_user.py:238 msgid "Remove [{yes}/{no}]?" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:243 +#: lib/pp_admintools/app/remove_ldap_user.py:245 msgid "Abort deactivating by {cls}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:245 +#: lib/pp_admintools/app/remove_ldap_user.py:247 msgid "Abort removing by {cls}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:254 +#: lib/pp_admintools/app/remove_ldap_user.py:256 msgid "Evaluating DNs of the user {!r} to remove ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:268 +#: lib/pp_admintools/app/remove_ldap_user.py:270 msgid "Got DN {dn!r} for user {user!r} in LDAP instance {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:275 +#: lib/pp_admintools/app/remove_ldap_user.py:277 msgid "Found {nr} entries for user {u!r} in LDAP instance {i}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:287 +#: lib/pp_admintools/app/remove_ldap_user.py:289 msgid "Did not found user {user!r} in LDAP instance {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:296 +#: lib/pp_admintools/app/remove_ldap_user.py:298 msgid "Deactivating all given users from {} ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:298 +#: lib/pp_admintools/app/remove_ldap_user.py:300 msgid "Removing all given users from {} ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:313 +#: lib/pp_admintools/app/remove_ldap_user.py:315 msgid "Deactivating user {dn!r} from {inst} ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:316 +#: lib/pp_admintools/app/remove_ldap_user.py:318 msgid "Removing user {dn!r} from {inst} ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:322 +#: lib/pp_admintools/app/remove_ldap_user.py:324 msgid "Attributes of {!r}:" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:343 +#: lib/pp_admintools/app/remove_ldap_user.py:345 msgid "{c} on removing user {dn!r}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:349 +#: lib/pp_admintools/app/remove_ldap_user.py:351 msgid "User {dn!r} successful deactivated on {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:352 +#: lib/pp_admintools/app/remove_ldap_user.py:354 msgid "User {dn!r} successful removed from {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:378 +#: lib/pp_admintools/app/remove_ldap_user.py:380 msgid "Updating user info for {dn!r} on {inst} ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:383 +#: lib/pp_admintools/app/remove_ldap_user.py:385 msgid "{c} on deactivating user {dn!r}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:399 +#: lib/pp_admintools/app/remove_ldap_user.py:401 msgid "Did not found any group memberships of {dn!r} in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:405 lib/pp_admintools/app/remove_ldap_user.py:432 -#: 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:407 lib/pp_admintools/app/remove_ldap_user.py:434 +#: lib/pp_admintools/app/remove_ldap_user.py:465 lib/pp_admintools/app/remove_ldap_user.py:496 msgid "Removing user {u!r} from group {g!r} ..." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:410 lib/pp_admintools/app/remove_ldap_user.py:437 -#: 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:412 lib/pp_admintools/app/remove_ldap_user.py:439 +#: lib/pp_admintools/app/remove_ldap_user.py:470 lib/pp_admintools/app/remove_ldap_user.py:501 msgid "{c} on removing user {dn!r} from group {g!r}: {e}" msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:426 +#: lib/pp_admintools/app/remove_ldap_user.py:428 msgid "Did not found any unique group memberships of {dn!r} in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:450 +#: lib/pp_admintools/app/remove_ldap_user.py:452 msgid "Deleting user {uid!r} from all POSIX groups in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:457 +#: lib/pp_admintools/app/remove_ldap_user.py:459 msgid "Did not found any POSIX group memberships of {uid!r} in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:481 +#: lib/pp_admintools/app/remove_ldap_user.py:483 msgid "Deleting user {uid!r} from all sudo groups in {inst}." msgstr "" -#: lib/pp_admintools/app/remove_ldap_user.py:488 +#: lib/pp_admintools/app/remove_ldap_user.py:490 msgid "Did not found any sudo group memberships of {uid!r} in {inst}." msgstr "" -- 2.39.5