Re: adduser 3.112+nmu2: Please update the PO translation for the package adduser
В Fri, 05 Nov 2010 20:51:34 -0400
David Prévot da...@tilapin.org пишет:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Le 05/11/2010 19:27, Sergey Alyoshin a écrit :
On 11/6/10, David Prévot da...@tilapin.org wrote:
Le 05/11/2010 15:09, Sergey Alyoshin a écrit :
Данная информация корректна? [Д/н] Д
/* Дд for Yy (yes), not work: FAIL */
Ouch, that's annoying... Could you confirm that it actually works with
“y” and “Y” (it seems so after a few tests, but I would prefer a
second opinion).
Y and y work just great.
Н is not ASCII char, it is Cyrillic capital en (UTF-8 0xd09d).
Sure, my mistake, sorry (silly me, I should know, I just updated
koi8-r(7) :/)
For this test code (my second Perl code after hello world):
my $yesexpr = langinfo(YESEXPR());
my $noexpr = langinfo(NOEXPR());
Great!
ж match ^[ДдYy].* # FAIL, any Cyrillic char will match?
Definitely a problem with Perl, I guess the issue should be addressed
there, thanks for digging.
With helping debian-russian@ I made a patch for adduser.
I test it with UTF8 and KOI8-R encodings.
Please check it with fr_FR.
--
Best Regards,
Yuri Kozlov
--- adduser-3.112+nmu1/adduser 2010-11-06 09:23:48.0 +0300
+++ /usr/sbin/adduser 2010-11-06 15:17:55.0 +0300
@@ -35,7 +35,7 @@
use Getopt::Long;
-my $version = VERSION;
+my $version = 3.112+nmu1;
###
# return values
@@ -66,18 +66,25 @@
}
eval {
require I18N::Langinfo;
- import I18N::Langinfo qw(langinfo YESEXPR NOEXPR);
+ import I18N::Langinfo qw(langinfo CODESET YESEXPR NOEXPR);
};
if ($@) {
*langinfo = sub { return shift; };
*YESEXPR = sub { ^[yY] };
*NOEXPR = sub { ^[nN] };
+*CODESET = sub { };
+}
+eval {
+ use Encode qw(decode);
+};
+if ($@) {
+ *decode = sub { shift; return shift; };
}
}
setlocale(LC_MESSAGES, );
textdomain(adduser);
-my $yesexpr = langinfo(YESEXPR());
+my $yesexpr = decode(langinfo(CODESET()), langinfo(YESEXPR()));
my %config; # configuration hash
@@ -531,7 +538,7 @@
create_homedir (1); # copy skeleton data
# useradd without -p has left the account disabled (password string is '!')
-my $yesexpr = langinfo(YESEXPR());
+my $yesexpr = decode(langinfo(CODESET()), langinfo(YESEXPR()));
if ($ask_passwd) {
for (;;) {
my $passwd = which('passwd');
@@ -554,6 +561,7 @@
# expression will be checked to find positive answer.
print (gtx(Try again? [y/N] ));
chop ($answer=STDIN);
+$answer = decode(langinfo(CODESET()), $answer);
last if ($answer !~ m/$yesexpr/o);
}
else {
@@ -571,7 +579,7 @@
ch_gecos($new_gecos);
}
else {
- my $noexpr = langinfo(NOEXPR());
+ my $noexpr = decode(langinfo(CODESET()), langinfo(NOEXPR()));
for (;;) {
my $chfn = which('chfn');
systemcall($chfn, $new_name);
@@ -580,6 +588,7 @@
# expression will be checked to find positive answer.
print (gtx(Is the information correct? [Y/n] ));
chop (my $answer=STDIN);
+$answer = decode(langinfo(CODESET()), $answer);
last if ($answer !~ m/$noexpr/o);
}
}
[BTS#602615] po-debconf://chemical-structures/ru.po
Hello. -- Best Regards, Yuri Kozlov -- To UNSUBSCRIBE, email to debian-l10n-russian-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20101106181608.446d2...@keeper.home.local
Re: adduser 3.112+nmu2: Please update the PO translation for the package adduser
Le 06/11/2010 11:01, Yuri Kozlov a écrit :
With helping debian-russian@ I made a patch for adduser.
I test it with UTF8 and KOI8-R encodings.
Please check it with fr_FR.
Works fine! Thanks again! You're welcome to submit your patch in a bug
against adduser. Since it's a l10n issue and the patch is not too
invasive, it should be accepted by the RT (submitting the bug will help
to convince the RT).
I just removed the “VERSION” change and kept the same indentation than
the original code (attached).
I'll ask for translation update with another +10days deadline today.
Regards
David
--- adduser-3.112+nmu1/adduser 2010-11-06 09:23:48.0 +0300
+++ /usr/sbin/adduser 2010-11-06 15:17:55.0 +0300
@@ -66,18 +66,25 @@
}
eval {
require I18N::Langinfo;
- import I18N::Langinfo qw(langinfo YESEXPR NOEXPR);
+ import I18N::Langinfo qw(langinfo CODESET YESEXPR NOEXPR);
};
if ($@) {
*langinfo = sub { return shift; };
*YESEXPR = sub { ^[yY] };
*NOEXPR = sub { ^[nN] };
+ *CODESET = sub { };
+}
+eval {
+ use Encode qw(decode);
+};
+if ($@) {
+ *decode = sub { shift; return shift; };
}
}
setlocale(LC_MESSAGES, );
textdomain(adduser);
-my $yesexpr = langinfo(YESEXPR());
+my $yesexpr = decode(langinfo(CODESET()), langinfo(YESEXPR()));
my %config; # configuration hash
@@ -531,7 +538,7 @@
create_homedir (1); # copy skeleton data
# useradd without -p has left the account disabled (password string is '!')
-my $yesexpr = langinfo(YESEXPR());
+my $yesexpr = decode(langinfo(CODESET()), langinfo(YESEXPR()));
if ($ask_passwd) {
for (;;) {
my $passwd = which('passwd');
@@ -554,6 +561,7 @@
# expression will be checked to find positive answer.
print (gtx(Try again? [y/N] ));
chop ($answer=STDIN);
+ $answer = decode(langinfo(CODESET()), $answer);
last if ($answer !~ m/$yesexpr/o);
}
else {
@@ -571,7 +579,7 @@
ch_gecos($new_gecos);
}
else {
- my $noexpr = langinfo(NOEXPR());
+ my $noexpr = decode(langinfo(CODESET()), langinfo(NOEXPR()));
for (;;) {
my $chfn = which('chfn');
systemcall($chfn, $new_name);
@@ -580,6 +588,7 @@
# expression will be checked to find positive answer.
print (gtx(Is the information correct? [Y/n] ));
chop (my $answer=STDIN);
+ $answer = decode(langinfo(CODESET()), $answer);
last if ($answer !~ m/$noexpr/o);
}
}
signature.asc
Description: OpenPGP digital signature
adduser 3.112+nmu2: Please update the PO translation for the package adduser
Hi, Sergey Alyoshin, thanks to him, brought to my attention (#602547), among other stuff, that the POT file used was outdated. As a result, the PO file I sent you last week was outdated too. Since I already received many PO file in a short notice, I hope that a delay of one more week will be enough for you to complete the few more outdated strings. I would be grateful if you could take the time and update it. Please send the updated file to me, or submit it as a wishlist bug against adduser. If you were working on the file and didn't send it yet, don't hesitate to get in touch with me if you have any difficulty to update your file. The deadline for receiving the updated translation is Tue, 16 Nov 2010 16:07:23 -0400. Thanks in advance, Regards David # translation of adduser_3.111_ru.po to Russian # adduser. # Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # Copyright (C) 2000 Peter Novodvorsky n...@debian.org. # # Yuri Kozlov kozlo...@gmail.com, 2004, 2005, 2006, 2007, 2008. # Yuri Kozlov yu...@komyakino.ru, 2009. msgid msgstr Project-Id-Version:adduser 3.111\n Report-Msgid-Bugs-To: adduser-de...@lists.alioth.debian.org\n POT-Creation-Date: 2010-11-06 12:34-0400\n PO-Revision-Date: 2009-12-06 07:35+0300\n Last-Translator: Yuri Kozlov yu...@komyakino.ru\n Language-Team: Russian debian-l10n-russian@lists.debian.org\n Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.4\n Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n %10=4 (n%10010 || n%100=20) ? 1 : 2);\n #. everyone can issue --help and --version, but only root can go on #: ../adduser:157 msgid Only root may add a user or group to the system.\n msgstr Только суперпользователь может добавить пользователя или группу в систему.\n #: ../adduser:183 ../deluser:137 msgid Only one or two names allowed.\n msgstr Можно указать только одно или два имени.\n #. must be addusertogroup #: ../adduser:188 msgid Specify only one name in this mode.\n msgstr Только одно имя можно указать в этом режиме.\n #: ../adduser:204 msgid The --group, --ingroup, and --gid options are mutually exclusive.\n msgstr Параметры --group, --ingroup и --gid взаимно исключаемые.\n #: ../adduser:209 msgid The home dir must be an absolute path.\n msgstr Домашний каталог должен задаваться в виде абсолютного пути.\n #: ../adduser:213 #, fuzzy, perl-format msgid Warning: The home dir %s you specified already exists.\n msgstr Предупреждение: указанный вами домашний каталог уже существует.\n #: ../adduser:215 #, fuzzy, perl-format msgid Warning: The home dir %s you specified can't be accessed: %s\n msgstr Предупреждение: указанный вами домашний каталог уже существует.\n #: ../adduser:277 #, perl-format msgid The group `%s' already exists as a system group. Exiting.\n msgstr Группа `%s' уже существует и является системной. Завершение работы.\n #: ../adduser:283 #, fuzzy, perl-format msgid The group `%s' already exists and is not a system group. Exiting.\n msgstr Группа `%s' уже существует и является системной. Завершение работы.\n #: ../adduser:289 #, perl-format msgid The group `%s' already exists, but has a different GID. Exiting.\n msgstr Группа `%s' уже существует, но имеет другой GID. Завершение работы.\n #: ../adduser:293 ../adduser:323 #, perl-format msgid The GID `%s' is already in use.\n msgstr GID `%s' уже используется.\n #: ../adduser:301 #, perl-format msgid No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n msgstr Нет свободного GID в диапазоне %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n #: ../adduser:302 ../adduser:332 #, perl-format msgid The group `%s' was not created.\n msgstr Группа `%s' не создана.\n #: ../adduser:307 ../adduser:336 #, perl-format msgid Adding group `%s' (GID %d) ...\n msgstr Добавляется группа `%s' (GID %d) ...\n #: ../adduser:312 ../adduser:341 ../adduser:366 ../deluser:370 ../deluser:407 #: ../deluser:444 msgid Done.\n msgstr Готово.\n #: ../adduser:321 ../adduser:801 #, perl-format msgid The group `%s' already exists.\n msgstr Группа `%s' уже существует.\n #: ../adduser:331 #, perl-format msgid No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n msgstr Нет свободного GID в диапазоне %d-%d (FIRST_GID - LAST_GID).\n #: ../adduser:350 ../deluser:229 ../deluser:416 #, perl-format msgid The user `%s' does not exist.\n msgstr Пользователь `%s' не существует.\n #: ../adduser:352 ../adduser:600 ../adduser:808 ../deluser:378 ../deluser:419 #, perl-format msgid The group `%s' does not exist.\n msgstr Группа `%s' не существует.\n #: ../adduser:355 ../adduser:604 #, perl-format msgid The user `%s' is already a member of `%s'.\n msgstr Пользователь `%s' уже является членом группы `%s'.\n #: ../adduser:360 ../adduser:610 #, perl-format msgid Adding user `%s' to group `%s' ...\n msgstr Добавляется пользователь `%s' в группу `%s' ...\n #: ../adduser:380 #, fuzzy,
