From 5bbbd9425822d0e97da4ce43038401a75eba814f Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Tue, 4 Sep 2012 14:23:25 +0200
Subject: po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 po/ru.po | 80 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'po/ru.po')

diff --git a/po/ru.po b/po/ru.po
index baec5421d..daaa291f2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2012-08-15 17:10+0200\n"
+"POT-Creation-Date: 2012-09-04 13:54+0200\n"
 "PO-Revision-Date: 2006-03-07 12:42+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 
 #: disk-utils/addpart.c:52 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
 #: disk-utils/blockdev.c:445 disk-utils/delpart.c:53 disk-utils/fdformat.c:62
-#: disk-utils/fdformat.c:155 disk-utils/fsck.c:1347
+#: disk-utils/fdformat.c:155 disk-utils/fsck.c:1364
 #: disk-utils/fsck.cramfs.c:146 disk-utils/fsck.cramfs.c:498
 #: disk-utils/isosize.c:126 disk-utils/mkfs.bfs.c:184
 #: disk-utils/mkfs.cramfs.c:660 disk-utils/mkfs.cramfs.c:786
@@ -303,7 +303,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: disk-utils/fdformat.c:131 disk-utils/fsck.c:1490 disk-utils/mkfs.bfs.c:89
+#: disk-utils/fdformat.c:131 disk-utils/fsck.c:1507 disk-utils/mkfs.bfs.c:89
 #: disk-utils/mkfs.cramfs.c:763 fdisks/sfdisk.c:2633 include/c.h:248
 #: misc-utils/cal.c:353 misc-utils/getopt.c:431 misc-utils/kill.c:193
 #: misc-utils/logger.c:264 misc-utils/look.c:126 misc-utils/lsblk.c:1360
@@ -360,158 +360,158 @@ msgstr "
 msgid "Single"
 msgstr "Одинарный"
 
-#: disk-utils/fsck.c:187
+#: disk-utils/fsck.c:191
 #, fuzzy, c-format
 msgid "%s is mounted\n"
 msgstr "%s примонтирован.\t "
 
-#: disk-utils/fsck.c:189
+#: disk-utils/fsck.c:193
 #, fuzzy, c-format
 msgid "%s is not mounted\n"
 msgstr "umount: %s: не найден"
 
-#: disk-utils/fsck.c:303 lib/path.c:98 lib/path.c:119 lib/path.c:165
+#: disk-utils/fsck.c:307 lib/path.c:98 lib/path.c:119 lib/path.c:165
 #, fuzzy, c-format
 msgid "failed to read: %s"
 msgstr "невозможно определить состояние %s"
 
-#: disk-utils/fsck.c:305 lib/path.c:121
+#: disk-utils/fsck.c:309 lib/path.c:121
 #, fuzzy, c-format
 msgid "parse error: %s"
 msgstr "ошибка поиска"
 
-#: disk-utils/fsck.c:325
+#: disk-utils/fsck.c:329
 #, fuzzy, c-format
 msgid "Locking disk %s ... "
 msgstr "Синхронизируются диски.\n"
 
-#: disk-utils/fsck.c:335
+#: disk-utils/fsck.c:339
 #, c-format
 msgid "(waiting) "
 msgstr ""
 
 #. TRANSLATORS: These are followups to "Locking disk...".
-#: disk-utils/fsck.c:345
+#: disk-utils/fsck.c:349
 #, fuzzy
 msgid "succeeded"
 msgstr "%s завершен успешно.\n"
 
-#: disk-utils/fsck.c:345
+#: disk-utils/fsck.c:349
 #, fuzzy
 msgid "failed"
 msgstr "поиск завершился неудачей"
 
-#: disk-utils/fsck.c:382
+#: disk-utils/fsck.c:386
 #, fuzzy, c-format
 msgid "failed to setup description for %s"
 msgstr "ioctl() завершился неудачей при чтении времени из %s"
 
-#: disk-utils/fsck.c:408
+#: disk-utils/fsck.c:412
 #, fuzzy, c-format
 msgid "%s: parse error at line %d -- ignore"
 msgstr "ошибка поиска"
 
-#: disk-utils/fsck.c:437 disk-utils/fsck.c:439
+#: disk-utils/fsck.c:441 disk-utils/fsck.c:443
 #, fuzzy, c-format
 msgid "%s: failed to parse fstab"
 msgstr "%s: невозможно открыть : %s\n"
 
-#: disk-utils/fsck.c:567 sys-utils/umount.c:217
+#: disk-utils/fsck.c:584 sys-utils/umount.c:217
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: не найден"
 
-#: disk-utils/fsck.c:593 login-utils/login.c:1085 login-utils/vipw.c:212
+#: disk-utils/fsck.c:610 login-utils/login.c:1085 login-utils/vipw.c:212
 #: sys-utils/flock.c:314 sys-utils/swapon.c:267 term-utils/script.c:264
 #: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "создание дочернего процесса завершилось неудачей\n"
 
-#: disk-utils/fsck.c:600
+#: disk-utils/fsck.c:617
 #, fuzzy, c-format
 msgid "%s: execute failed"
 msgstr "openpty завершился неудачей\n"
 
-#: disk-utils/fsck.c:688
+#: disk-utils/fsck.c:705
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: disk-utils/fsck.c:691
+#: disk-utils/fsck.c:708
 #, fuzzy
 msgid "waidpid failed"
 msgstr "setuid() завершился неудачей"
 
-#: disk-utils/fsck.c:709
+#: disk-utils/fsck.c:726
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: disk-utils/fsck.c:715
+#: disk-utils/fsck.c:732
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: disk-utils/fsck.c:761
+#: disk-utils/fsck.c:778
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: disk-utils/fsck.c:823
+#: disk-utils/fsck.c:840
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: ошибка %d при распаковке! %p(%d)\n"
 
-#: disk-utils/fsck.c:892
+#: disk-utils/fsck.c:909
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: disk-utils/fsck.c:1009
+#: disk-utils/fsck.c:1026
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: disk-utils/fsck.c:1021
+#: disk-utils/fsck.c:1038
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s не lp-устройство.\n"
 
-#: disk-utils/fsck.c:1026
+#: disk-utils/fsck.c:1043
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: disk-utils/fsck.c:1043
+#: disk-utils/fsck.c:1060
 #, fuzzy, c-format
 msgid "%s: skipping unknown filesystem type\n"
 msgstr "mount: неизвестный тип файловой системы '%s'"
 
-#: disk-utils/fsck.c:1062
+#: disk-utils/fsck.c:1079
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: disk-utils/fsck.c:1151
+#: disk-utils/fsck.c:1168
 #, fuzzy
 msgid "failed to allocate iterator"
 msgstr "Невозможно выделить буфер.\n"
 
-#: disk-utils/fsck.c:1166
+#: disk-utils/fsck.c:1183
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Запускается проверка файловой системы на %s.\n"
 
-#: disk-utils/fsck.c:1257
+#: disk-utils/fsck.c:1274
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: disk-utils/fsck.c:1281
+#: disk-utils/fsck.c:1298
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -519,7 +519,7 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Использование: %s [опции] устройство...\n"
 
-#: disk-utils/fsck.c:1285
+#: disk-utils/fsck.c:1302
 msgid ""
 "\n"
 "Options:\n"
@@ -541,32 +541,32 @@ msgid ""
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: disk-utils/fsck.c:1337
+#: disk-utils/fsck.c:1354
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s не lp-устройство.\n"
 
-#: disk-utils/fsck.c:1349
+#: disk-utils/fsck.c:1366
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s размонтирован\n"
 
-#: disk-utils/fsck.c:1357
+#: disk-utils/fsck.c:1374
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Размонтируются все оставшиеся файловые системы..."
 
-#: disk-utils/fsck.c:1361
+#: disk-utils/fsck.c:1378
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Размонтируются все оставшиеся файловые системы..."
 
-#: disk-utils/fsck.c:1369 disk-utils/fsck.c:1457 sys-utils/eject.c:285
+#: disk-utils/fsck.c:1386 disk-utils/fsck.c:1474 sys-utils/eject.c:285
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: неизвестный аргумент: %s\n"
 
-#: disk-utils/fsck.c:1509
+#: disk-utils/fsck.c:1526
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
-- 
cgit v1.2.3-55-g7522