Author: zugschlus
Date: 2005-03-18 16:29:07 +0100 (Fri, 18 Mar 2005)
New Revision: 217
Added:
trunk/po/adduser.pot
Modified:
trunk/debian/changelog
trunk/deluser
Log:
* Re-generate adduser.pot, fix gettext bugs in deluser. Thanks to
Hans Fredrik Nordhaug. (mh)
Modified: trunk/debian/changelog
==================================================================---
trunk/debian/changelog 2005-03-10 11:39:12 UTC (rev 216)
+++ trunk/debian/changelog 2005-03-18 15:29:07 UTC (rev 217)
@@ -3,8 +3,10 @@
* NOT RELEASED YET
* Updated Norwegian Bokmal debconf templates and program translations.
Thanks to Hans Fredrik Nordhaug. (mh) Closes: #298834
+ * Re-generate adduser.pot, fix gettext bugs in deluser. Thanks to
+ Hans Fredrik Nordhaug. (mh)
- -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 10 Mar 2005
11:36:22 +0000
+ -- Marc Haber <mh+debian-packages@zugschlus.de> Fri, 18 Mar 2005
16:28:42 +0100
adduser (3.63) unstable; urgency=low
Modified: trunk/deluser
==================================================================---
trunk/deluser 2005-03-10 11:39:12 UTC (rev 216)
+++ trunk/deluser 2005-03-18 15:29:07 UTC (rev 217)
@@ -282,14 +282,14 @@
sub home_match {
foreach my $mount (@mountpoints) {
if( $File::Find::name eq $mount ) {
- s_print(_("Not backing up/removing $File::Find::name, it is a mount
point.\n"));
+ s_print(_("Not backing up/removing `%s'', it is a mount
point.\n"),$File::Find::name);
$File::Find::prune=1;
return;
}
}
foreach my $re ( split '' '',
$config{"no_del_paths"} ) {
if( $File::Find::name =~ qr/$re/ ) {
- s_print(_("Not backing up/removing $File::Find::name, it matches
$re.\n"));
+ s_print(_("Not backing up/removing `%s'', it matches
%s.\n"),$File::Find::name,$re);
$File::Find::prune=1;
return;
}
@@ -438,7 +438,7 @@
sub usage {
printf("deluser: %s $version\n\n",_("removing user and
groups from the system. Version:"));
- print("deluser user
+ printf(_("deluser user
remove a normal user from the system
example: deluser mike
@@ -467,7 +467,7 @@
--quiet | -q don''t give process information to stdout
--help | -h usage message
--version | -v version number and copyright
- --conf | -c FILE use FILE instead of $defaults\n\n");
+ --conf | -c FILE use FILE instead of %s\n\n"),$defaults);
printf(_("Global configuration is in the file %s.\n"),
$defaults);
}
Added: trunk/po/adduser.pot
==================================================================---
trunk/po/adduser.pot 2005-03-10 11:39:12 UTC (rev 216)
+++ trunk/po/adduser.pot 2005-03-18 15:29:07 UTC (rev 217)
@@ -0,0 +1,499 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE''S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-03-18 16:26+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../adduser:126 ../deluser:133
+msgid "No options allowed after names.\n"
+msgstr ""
+
+#: ../adduser:145
+msgid "--ingroup requires an argument.\n"
+msgstr ""
+
+#: ../adduser:148 ../deluser:158
+msgid "--home requires an argument.\n"
+msgstr ""
+
+#: ../adduser:150
+msgid "The home dir must be an absolute path.\n"
+msgstr ""
+
+#: ../adduser:153
+msgid "--gecos requires an argument.\n"
+msgstr ""
+
+#: ../adduser:156
+msgid "--shell requires an argument.\n"
+msgstr ""
+
+#: ../adduser:165
+msgid "--uid requires a numeric argument.\n"
+msgstr ""
+
+#: ../adduser:168
+msgid "--firstuid requires a numeric argument.\n"
+msgstr ""
+
+#: ../adduser:171
+msgid "--lastuid requires a numeric argument.\n"
+msgstr ""
+
+#: ../adduser:174
+msgid "--gid requires a numeric argument.\n"
+msgstr ""
+
+#: ../adduser:177 ../deluser:149
+msgid "--conf requires an argument.\n"
+msgstr ""
+
+#: ../adduser:179 ../deluser:151
+#, perl-format
+msgid "`%s'' does not exist.\n"
+msgstr ""
+
+#: ../adduser:186 ../deluser:170
+#, perl-format
+msgid "Unknown argument `%s''.\n"
+msgstr ""
+
+#: ../adduser:192
+msgid "Only root may add a user or group to the system.\n"
+msgstr ""
+
+#: ../adduser:195
+msgid "Warning: The home dir you specified already exists.\n"
+msgstr ""
+
+#: ../adduser:197
+msgid "Warning: The home dir you specified does not exist.\n"
+msgstr ""
+
+#: ../adduser:204
+msgid "Enter a groupname to add: "
+msgstr ""
+
+#: ../adduser:208
+msgid "Enter a username to add: "
+msgstr ""
+
+#: ../adduser:213
+msgid "I need a name to add.\n"
+msgstr ""
+
+#: ../adduser:214 ../deluser:201
+msgid "No more than two names.\n"
+msgstr ""
+
+#: ../adduser:216 ../deluser:204
+msgid "Specify only one name in this mode.\n"
+msgstr ""
+
+#: ../adduser:237
+msgid "The --group, --ingroup, and --gid options are mutually
exclusive.\n"
+msgstr ""
+
+#: ../adduser:283
+#, perl-format
+msgid "The group `%s'' already exists as a system group.
Exiting...\n"
+msgstr ""
+
+#: ../adduser:286 ../adduser:316 ../adduser:671
+#, perl-format
+msgid "The group `%s'' already exists.\n"
+msgstr ""
+
+#: ../adduser:288 ../adduser:318 ../adduser:673
+#, perl-format
+msgid "The GID %s is already in use.\n"
+msgstr ""
+
+#: ../adduser:296 ../adduser:326
+msgid "No GID is available in the range "
+msgstr ""
+
+#: ../adduser:299 ../adduser:329
+#, perl-format
+msgid "The group `%s'' was not created.\n"
+msgstr ""
+
+#: ../adduser:303 ../adduser:333
+#, perl-format
+msgid "Adding group `%s'' (%s)...\n"
+msgstr ""
+
+#: ../adduser:307 ../adduser:337 ../adduser:369
+msgid "Done.\n"
+msgstr ""
+
+#: ../adduser:346 ../deluser:264 ../deluser:386
+#, perl-format
+msgid "The user `%s'' does not exist.\n"
+msgstr ""
+
+#: ../adduser:348 ../adduser:678 ../deluser:356 ../deluser:389
+#, perl-format
+msgid "The group `%s'' does not exist.\n"
+msgstr ""
+
+#: ../adduser:351
+#, perl-format
+msgid "The user `%s'' is already a member of
`%s''.\n"
+msgstr ""
+
+#: ../adduser:356
+#, perl-format
+msgid "Adding user `%s'' to group `%s''...\n"
+msgstr ""
+
+#: ../adduser:379
+#, perl-format
+msgid "The user `%s'' already exists as a system user.
Exiting...\n"
+msgstr ""
+
+#: ../adduser:385
+#, perl-format
+msgid "Adding system user `%s''...\n"
+msgstr ""
+
+#: ../adduser:392 ../adduser:479
+msgid "No UID/GID pair is available in the range "
+msgstr ""
+
+#: ../adduser:395 ../adduser:408 ../adduser:482 ../adduser:495
+#, perl-format
+msgid "The user `%s'' was not created.\n"
+msgstr ""
+
+#: ../adduser:405 ../adduser:492
+msgid "No UID is available in the range "
+msgstr ""
+
+#: ../adduser:412 ../adduser:418 ../adduser:499 ../adduser:505
+msgid "Internal error"
+msgstr ""
+
+#: ../adduser:423 ../adduser:510
+#, perl-format
+msgid "Adding new group `%s'' (%s).\n"
+msgstr ""
+
+#: ../adduser:429 ../adduser:516
+#, perl-format
+msgid "Adding new user `%s'' (%s) with group
`%s''.\n"
+msgstr ""
+
+#: ../adduser:443
+msgid "Not creating home directory.\n"
+msgstr ""
+
+#: ../adduser:445
+#, perl-format
+msgid "Home directory `%s'' already exists.\n"
+msgstr ""
+
+#: ../adduser:447 ../adduser:532
+#, perl-format
+msgid "Creating home directory `%s''.\n"
+msgstr ""
+
+#: ../adduser:472
+#, perl-format
+msgid "Adding user `%s''...\n"
+msgstr ""
+
+#: ../adduser:526
+#, perl-format
+msgid "The home directory `%s'' already exists. Not copying from
`%s''\n"
+msgstr ""
+
+#: ../adduser:542
+#, perl-format
+msgid "Copying files from `%s''\n"
+msgstr ""
+
+#: ../adduser:568
+msgid "Is the information correct? [y/N] "
+msgstr ""
+
+#: ../adduser:570
+msgid "y"
+msgstr ""
+
+#: ../adduser:575
+#, perl-format
+msgid "Setting quota from `%s''.\n"
+msgstr ""
+
+#: ../adduser:661
+#, perl-format
+msgid "The user `%s'' already exists, and is not a system
user.\n"
+msgstr ""
+
+#: ../adduser:663
+#, perl-format
+msgid "The user `%s'' already exists.\n"
+msgstr ""
+
+#: ../adduser:666
+#, perl-format
+msgid "The UID %s is already in use.\n"
+msgstr ""
+
+#: ../adduser:680
+#, perl-format
+msgid "The GID %s does not exist.\n"
+msgstr ""
+
+#: ../adduser:731
+msgid ""
+"To avoid problems, the username should consist of\n"
+"letters, digits, underscores, periods and dashes. For compatibility
with\n"
+"Samba machine accounts $ is also supported at the end of the
username\n"
+msgstr ""
+
+#: ../adduser:738
+msgid "Allowing use of questionable username.\n"
+msgstr ""
+
+#: ../adduser:742
+msgid ""
+"Please enter a username matching the regular expression
configured\n"
+"via the name_regex configuration variable. Use the
`--force-badname''\n"
+"option to relax this check or reconfigure name_regex.\n"
+msgstr ""
+
+#: ../adduser:757
+#, perl-format
+msgid "Selecting from %s %s (%s).\n"
+msgstr ""
+
+#: ../adduser:822
+#, perl-format
+msgid "Removing directory `%s''\n"
+msgstr ""
+
+#: ../adduser:826
+#, perl-format
+msgid "Removing user `%s''.\n"
+msgstr ""
+
+#: ../adduser:830
+#, perl-format
+msgid "Removing group `%s''.\n"
+msgstr ""
+
+#: ../adduser:863
+#, perl-format
+msgid ""
+"adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid
ID]\n"
+"[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid
ID]\n"
+"[--disabled-password] [--disabled-login] user\n"
+" Add a normal user\n"
+"\n"
+"adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid
ID]\n"
+"[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-"
+"password]\n"
+"[--disabled-login] user\n"
+" Add a system user\n"
+"\n"
+"adduser --group [--gid ID] group\n"
+"addgroup [--gid ID] group\n"
+" Add a user group\n"
+"\n"
+"addgroup --system [--gid ID] group\n"
+" Add a system group\n"
+"\n"
+"adduser user group\n"
+" Add an existing user to an existing group\n"
+"\n"
+"Global configuration is in the file %s.\n"
+"Other options are [--quiet] [--force-badname] [--help] [--version]
[--conf\n"
+"FILE].\n"
+msgstr ""
+
+#: ../deluser:167
+msgid "--backup-to requires an argument.\n"
+msgstr ""
+
+#: ../deluser:185
+msgid ""
+"In order to use the --remove-home, --remove-all-files, and --backup
"
+"features,\n"
+"you need to install the `perl-modules'' package. To accomplish
that, run\n"
+"apt-get install perl-modules\n"
+msgstr ""
+
+#: ../deluser:188
+msgid "Only root may remove a user or group from the system.\n"
+msgstr ""
+
+#: ../deluser:192
+msgid "Enter a groupname to remove: "
+msgstr ""
+
+#: ../deluser:194
+msgid "Enter a username to remove: "
+msgstr ""
+
+#: ../deluser:200
+msgid "I need a name to remove.\n"
+msgstr ""
+
+#: ../deluser:254
+#, perl-format
+msgid "The user `%s'' is not a system account... Exiting.\n"
+msgstr ""
+
+#: ../deluser:258
+#, perl-format
+msgid "The user `%s'' does not exist, but --system was given...
Exiting.\n"
+msgstr ""
+
+#: ../deluser:268
+#, perl-format
+msgid "passwd home dir `%s'' does not match command line home dir,
aborting.\n"
+msgstr ""
+
+#: ../deluser:270
+msgid "Looking for files to backup/remove...\n"
+msgstr ""
+
+#: ../deluser:285
+#, perl-format
+msgid "Not backing up/removing `%s'', it is a mount point.\n"
+msgstr ""
+
+#: ../deluser:292
+#, perl-format
+msgid "Not backing up/removing `%s'', it matches %s.\n"
+msgstr ""
+
+#: ../deluser:322
+msgid "Backing up files to be removed to "
+msgstr ""
+
+#: ../deluser:337
+msgid "Removing files...\n"
+msgstr ""
+
+#: ../deluser:345
+#, perl-format
+msgid "Removing user `%s''...\n"
+msgstr ""
+
+#: ../deluser:352 ../deluser:380 ../deluser:413
+msgid "done.\n"
+msgstr ""
+
+#: ../deluser:360
+#, perl-format
+msgid "getgrnam `%s'' failed. This shouldn''t
happen.\n"
+msgstr ""
+
+#: ../deluser:365
+#, perl-format
+msgid "The group `%s'' is not a system group... Exiting.\n"
+msgstr ""
+
+#: ../deluser:369
+#, perl-format
+msgid "The group `%s'' is not empty!\n"
+msgstr ""
+
+#: ../deluser:374
+#, perl-format
+msgid "There are users with `%s'' as their primary group!\n"
+msgstr ""
+
+#: ../deluser:377
+#, perl-format
+msgid "Removing group `%s''...\n"
+msgstr ""
+
+#: ../deluser:392
+msgid "You may not remove the user from his/her primary group.\n"
+msgstr ""
+
+#: ../deluser:406
+#, perl-format
+msgid "The user `%s'' is not a member of group
`%s''.\n"
+msgstr ""
+
+#: ../deluser:409
+#, perl-format
+msgid "Removing user `%s'' from group `%s''...\n"
+msgstr ""
+
+#: ../deluser:420 ../deluser:439
+msgid "removing user and groups from the system. Version:"
+msgstr ""
+
+#: ../deluser:441
+#, perl-format
+msgid ""
+"deluser user\n"
+" remove a normal user from the system\n"
+" example: deluser mike\n"
+"\n"
+" --remove-home remove the users home directory and mail
spool\n"
+" --remove-all-files remove all files owned by user\n"
+" --home <dir> remove home only if /etc/passwd home
dir\n"
+" matches directory given here\n"
+" --backup\t\t backup files before removing.\n"
+" --backup-to <dir> target directory for the
backups.\n"
+" Default is the current directory.\n"
+" --system only remove if system user\n"
+"\n"
+"delgroup group\n"
+"deluser --group group\n"
+" remove a group from the system\n"
+" example: deluser --group students\n"
+"\n"
+" --system only remove if system group\n"
+" --only-if-empty only remove if no members left\n"
+"\n"
+"deluser user group\n"
+" remove the user from a group\n"
+" example: deluser mike students\n"
+"\n"
+"general options:\n"
+" --quiet | -q don''t give process information to
stdout\n"
+" --help | -h usage message\n"
+" --version | -v version number and copyright\n"
+" --conf | -c FILE use FILE instead of %s\n"
+"\n"
+msgstr ""
+
+#: ../deluser:472
+#, perl-format
+msgid "Global configuration is in the file %s.\n"
+msgstr ""
+
+#: ../AdduserCommon.pm:78
+#, perl-format
+msgid "%s: %s doesn''t exist. Using defaults.\n"
+msgstr ""
+
+#: ../AdduserCommon.pm:88
+#, perl-format
+msgid "Couldn''t parse %s:%s.\n"
+msgstr ""
+
+#: ../AdduserCommon.pm:93
+#, perl-format
+msgid "Unknown variable `%s'' at %s:%s.\n"
+msgstr ""