summaryrefslogtreecommitdiffstats
path: root/po/ru.po
diff options
context:
space:
mode:
authorKarel Zak2016-03-29 10:38:01 +0200
committerKarel Zak2016-03-29 10:38:01 +0200
commit784c8a40fa3792a3998c39c4d8a9bf70ab33ec79 (patch)
treebb7610497696ee0d4394097c7e84fa5e9134ba08 /po/ru.po
parentpo: update ja.po (from translationproject.org) (diff)
downloadkernel-qcow2-util-linux-784c8a40fa3792a3998c39c4d8a9bf70ab33ec79.tar.gz
kernel-qcow2-util-linux-784c8a40fa3792a3998c39c4d8a9bf70ab33ec79.tar.xz
kernel-qcow2-util-linux-784c8a40fa3792a3998c39c4d8a9bf70ab33ec79.zip
po: merge changes
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po1369
1 files changed, 711 insertions, 658 deletions
diff --git a/po/ru.po b/po/ru.po
index e9a1a7b11..284354e3f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.27-rc2\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2016-03-10 14:40+0100\n"
+"POT-Creation-Date: 2016-03-29 10:35+0200\n"
"PO-Revision-Date: 2015-12-29 22:55+0300\n"
"Last-Translator: Evgeniy Yakushev <yen81@mail.ru>\n"
"Language-Team: Russian <gnu@d07.ru>\n"
@@ -37,26 +37,26 @@ msgstr "Сообщить ядру о существовании указанно
#: disk-utils/isosize.c:134 disk-utils/mkfs.bfs.c:189
#: disk-utils/mkfs.cramfs.c:164 disk-utils/mkfs.cramfs.c:655
#: disk-utils/mkfs.cramfs.c:782 disk-utils/mkfs.minix.c:823
-#: disk-utils/mkswap.c:215 disk-utils/mkswap.c:244 disk-utils/partx.c:952
+#: disk-utils/mkswap.c:215 disk-utils/mkswap.c:244 disk-utils/partx.c:994
#: disk-utils/resizepart.c:101 disk-utils/sfdisk.c:630 disk-utils/sfdisk.c:686
#: disk-utils/sfdisk.c:740 disk-utils/sfdisk.c:799 disk-utils/sfdisk.c:863
#: disk-utils/sfdisk.c:904 disk-utils/sfdisk.c:934 disk-utils/sfdisk.c:968
#: disk-utils/sfdisk.c:1466 disk-utils/swaplabel.c:60 libfdisk/src/bsd.c:641
#: lib/path.c:70 lib/path.c:82 login-utils/islocal.c:87 login-utils/last.c:653
-#: login-utils/sulogin.c:475 login-utils/sulogin.c:512
+#: login-utils/sulogin.c:480 login-utils/sulogin.c:517
#: login-utils/utmpdump.c:126 login-utils/utmpdump.c:348
#: login-utils/utmpdump.c:370 login-utils/vipw.c:255 login-utils/vipw.c:273
-#: misc-utils/findmnt.c:1121 misc-utils/logger.c:1178 misc-utils/mcookie.c:115
+#: misc-utils/findmnt.c:1121 misc-utils/logger.c:1180 misc-utils/mcookie.c:115
#: misc-utils/uuidd.c:207 sys-utils/blkdiscard.c:183 sys-utils/dmesg.c:522
#: sys-utils/eject.c:500 sys-utils/eject.c:700 sys-utils/fallocate.c:374
#: sys-utils/fsfreeze.c:128 sys-utils/fstrim.c:72 sys-utils/hwclock.c:280
#: sys-utils/hwclock-cmos.c:638 sys-utils/hwclock-rtc.c:162
#: sys-utils/hwclock-rtc.c:256 sys-utils/hwclock-rtc.c:401
#: sys-utils/hwclock-rtc.c:422 sys-utils/hwclock-rtc.c:469
-#: sys-utils/ldattach.c:388 sys-utils/nsenter.c:124 sys-utils/rtcwake.c:135
+#: sys-utils/ldattach.c:388 sys-utils/nsenter.c:126 sys-utils/rtcwake.c:135
#: sys-utils/rtcwake.c:269 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529
-#: sys-utils/setpriv.c:552 sys-utils/swapon.c:352 sys-utils/swapon.c:488
-#: sys-utils/switch_root.c:163 sys-utils/unshare.c:105 sys-utils/unshare.c:120
+#: sys-utils/setpriv.c:552 sys-utils/swapon.c:371 sys-utils/swapon.c:514
+#: sys-utils/switch_root.c:163 sys-utils/unshare.c:106 sys-utils/unshare.c:121
#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2616
#: term-utils/agetty.c:2640 term-utils/mesg.c:127 term-utils/script.c:420
#: term-utils/script.c:426 term-utils/script.c:428 term-utils/script.c:516
@@ -588,8 +588,8 @@ msgstr "Вы уверены, что хотите записать таблицу
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "Наберите \"yes\" или \"no\", или нажмите ESC для возврата."
-#: disk-utils/cfdisk.c:2371 login-utils/lslogins.c:208 sys-utils/lscpu.c:1313
-#: sys-utils/lscpu.c:1323
+#: disk-utils/cfdisk.c:2371 login-utils/lslogins.c:208 sys-utils/lscpu.c:1346
+#: sys-utils/lscpu.c:1356
msgid "yes"
msgstr "да"
@@ -611,7 +611,7 @@ msgstr "Обратите внимание, что записи таблицы р
#: disk-utils/cfdisk.c:2439
#, c-format
-msgid "Device already contains %s signature, it will be removed by write command."
+msgid "Device already contains a %s signature; it will be removed by a write command."
msgstr ""
#: disk-utils/cfdisk.c:2450
@@ -741,18 +741,18 @@ msgstr "недопустимый аргумент - repair"
#: disk-utils/fdformat.c:221 disk-utils/fsck.cramfs.c:145
#: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:330
#: disk-utils/mkfs.cramfs.c:742 disk-utils/mkfs.cramfs.c:779
-#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:241 disk-utils/partx.c:891
+#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:241 disk-utils/partx.c:933
#: login-utils/last.c:667 login-utils/utmpdump.c:129 misc-utils/namei.c:135
#: misc-utils/rename.c:63 sys-utils/blkdiscard.c:186 sys-utils/dmesg.c:524
#: sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:131 sys-utils/fstrim.c:77
-#: sys-utils/swapon.c:493 sys-utils/switch_root.c:93
+#: sys-utils/swapon.c:519 sys-utils/switch_root.c:93
#: sys-utils/switch_root.c:133 term-utils/mesg.c:129 text-utils/more.c:509
#: text-utils/tailf.c:104 text-utils/tailf.c:281
#, c-format
msgid "stat of %s failed"
msgstr "выполение команды stat для %s завершилось неудачно"
-#: disk-utils/fdformat.c:224 disk-utils/partx.c:949 misc-utils/lsblk.c:1477
+#: disk-utils/fdformat.c:224 disk-utils/partx.c:991 misc-utils/lsblk.c:1476
#: sys-utils/blkdiscard.c:188 sys-utils/mountpoint.c:107
#, c-format
msgid "%s: not a block device"
@@ -787,7 +787,7 @@ msgstr "номер конечной дорожки, заданной польз
msgid "user defined start track exceeds the user defined end track"
msgstr "номер начальной дорожки, заданной пользователем, превышает номер конечной дорожки"
-#: disk-utils/fdformat.c:251 misc-utils/logger.c:977
+#: disk-utils/fdformat.c:251 misc-utils/logger.c:979
msgid "close failed"
msgstr "не удалось закрыть"
@@ -931,7 +931,7 @@ msgstr " -b, --sector-size <размер> размер физического
#: disk-utils/fdisk.c:732
#, fuzzy
-msgid " -B, --protect-boot don't erase bootbits when create a new label\n"
+msgid " -B, --protect-boot don't erase bootbits when creating a new label\n"
msgstr " -B, --protect-boot не очищать биты загрузки при создании новой метки\n"
#: disk-utils/fdisk.c:733
@@ -1037,11 +1037,11 @@ msgstr ""
#: disk-utils/fdisk.c:977 disk-utils/sfdisk.c:1540
#, c-format
-msgid "%s: device already contains %s signature."
+msgid "Device %s already contains a %s signature."
msgstr ""
#: disk-utils/fdisk.c:986 disk-utils/sfdisk.c:1549
-msgid "The signature will be removed by write command."
+msgid "The signature will be removed by a write command."
msgstr ""
#: disk-utils/fdisk.c:989 disk-utils/sfdisk.c:1552
@@ -1558,7 +1558,7 @@ msgstr "%s не примонтирован\n"
#: disk-utils/fsck.cramfs.c:175 disk-utils/fsck.cramfs.c:229
#: disk-utils/fsck.cramfs.c:247 disk-utils/sfdisk.c:295 libfdisk/src/bsd.c:646
#: lib/path.c:110 lib/path.c:131 lib/path.c:152 lib/path.c:200
-#: login-utils/last.c:191 login-utils/last.c:228 login-utils/sulogin.c:689
+#: login-utils/last.c:191 login-utils/last.c:228 login-utils/sulogin.c:694
#: sys-utils/setpriv.c:239 term-utils/setterm.c:725 term-utils/setterm.c:782
#: term-utils/setterm.c:786 term-utils/setterm.c:793
#, c-format
@@ -1604,9 +1604,10 @@ msgstr "Разблокировка %s.\n"
msgid "failed to setup description for %s"
msgstr "не удалось задать описание для %s"
-#: disk-utils/fsck.c:473
-#, c-format
-msgid "%s: parse error at line %d -- ignore"
+#: disk-utils/fsck.c:473 misc-utils/findmnt.c:807 misc-utils/lsblk.c:433
+#: sys-utils/mount.c:102 sys-utils/swapon-common.c:19 sys-utils/umount.c:46
+#, fuzzy, c-format
+msgid "%s: parse error at line %d -- ignored"
msgstr "%s: ошибка разбора в строке %d — игнорируется"
#: disk-utils/fsck.c:505 disk-utils/fsck.c:507
@@ -1614,9 +1615,9 @@ msgstr "%s: ошибка разбора в строке %d — игнориру
msgid "%s: failed to parse fstab"
msgstr "%s: ошибка разбора fstab"
-#: disk-utils/fsck.c:679 login-utils/login.c:967 login-utils/sulogin.c:1059
-#: login-utils/vipw.c:203 sys-utils/flock.c:326 sys-utils/nsenter.c:149
-#: sys-utils/swapon.c:302 sys-utils/unshare.c:218 sys-utils/unshare.c:412
+#: disk-utils/fsck.c:679 login-utils/login.c:967 login-utils/sulogin.c:1063
+#: login-utils/vipw.c:203 sys-utils/flock.c:326 sys-utils/nsenter.c:151
+#: sys-utils/swapon.c:316 sys-utils/unshare.c:219 sys-utils/unshare.c:420
#: term-utils/script.c:774
msgid "fork failed"
msgstr "не удалось создать дочерний процесс"
@@ -1630,8 +1631,8 @@ msgstr "%s: не удалось выполнить"
msgid "wait: no more child process?!?"
msgstr "wait: больше нет дочерних процессов?"
-#: disk-utils/fsck.c:777 sys-utils/flock.c:343 sys-utils/swapon.c:334
-#: sys-utils/unshare.c:396 sys-utils/unshare.c:417
+#: disk-utils/fsck.c:777 sys-utils/flock.c:343 sys-utils/swapon.c:348
+#: sys-utils/unshare.c:404 sys-utils/unshare.c:425
msgid "waitpid failed"
msgstr "waitpid завершился неудачей"
@@ -1949,7 +1950,7 @@ msgstr "безразмерные (%ld против %ld) байты"
#: disk-utils/fsck.cramfs.c:408 disk-utils/fsck.cramfs.c:512
#: disk-utils/swaplabel.c:104 misc-utils/uuidd.c:376 sys-utils/fallocate.c:382
-#: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:370
+#: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:389
#: term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
@@ -2499,7 +2500,7 @@ msgstr ""
"----------------------------\n"
#: disk-utils/fsck.minix.c:1404 disk-utils/mkfs.minix.c:837
-#: disk-utils/mkswap.c:539 disk-utils/partx.c:1004 disk-utils/resizepart.c:112
+#: disk-utils/mkswap.c:539 disk-utils/partx.c:1035 disk-utils/resizepart.c:112
#: login-utils/utmpdump.c:388 sys-utils/dmesg.c:657 sys-utils/wdctl.c:346
#: sys-utils/wdctl.c:411 term-utils/script.c:272 term-utils/script.c:348
#: text-utils/pg.c:1248
@@ -2742,11 +2743,11 @@ msgstr " -h, --help показать эту справку и выйт
#: disk-utils/mkfs.c:139 lib/exec_shell.c:49 login-utils/newgrp.c:233
#: login-utils/su-common.c:651 login-utils/su-common.c:986
-#: login-utils/sulogin.c:825 login-utils/sulogin.c:829 schedutils/chrt.c:516
+#: login-utils/sulogin.c:829 login-utils/sulogin.c:833 schedutils/chrt.c:516
#: schedutils/ionice.c:260 schedutils/taskset.c:239 sys-utils/flock.c:332
-#: sys-utils/nsenter.c:407 sys-utils/prlimit.c:644 sys-utils/rtcwake.c:579
-#: sys-utils/setarch.c:324 sys-utils/setarch.c:399 sys-utils/setsid.c:117
-#: sys-utils/swapon.c:326 sys-utils/switch_root.c:243 sys-utils/unshare.c:453
+#: sys-utils/nsenter.c:416 sys-utils/prlimit.c:644 sys-utils/rtcwake.c:579
+#: sys-utils/setarch.c:324 sys-utils/setarch.c:402 sys-utils/setsid.c:117
+#: sys-utils/swapon.c:340 sys-utils/switch_root.c:243 sys-utils/unshare.c:461
#: term-utils/script.c:575 text-utils/pg.c:1375
#, c-format
msgid "failed to execute %s"
@@ -3314,12 +3315,12 @@ msgstr "предупреждение: пространство для swap ум
msgid "error: %s is mounted; will not make swapspace"
msgstr "ошибка: %s примонтирован; пространство swap не будет создано"
-#: disk-utils/mkswap.c:468 sys-utils/swapon.c:499
+#: disk-utils/mkswap.c:468 sys-utils/swapon.c:525
#, fuzzy, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr "%s: предупреждение: %s имеет небезопасные разрешения %04o, рекомендуется %04o\n"
-#: disk-utils/mkswap.c:472 sys-utils/swapon.c:504
+#: disk-utils/mkswap.c:472 sys-utils/swapon.c:530
#, fuzzy, c-format
msgid "%s: insecure file owner %d, 0 (root) suggested."
msgstr "%s: предупреждение: %s имеет небезопасные разрешения %04o, рекомендуется %04o\n"
@@ -3421,8 +3422,8 @@ msgstr "%s: не удалось настроить устройство обра
#: disk-utils/partx.c:161 login-utils/lslogins.c:322 misc-utils/findmnt.c:401
#: misc-utils/lsblk.c:354 misc-utils/lslocks.c:319 sys-utils/losetup.c:107
-#: sys-utils/lscpu.c:339 sys-utils/lsipc.c:231 sys-utils/lsns.c:187
-#: sys-utils/prlimit.c:277 sys-utils/swapon.c:136 sys-utils/wdctl.c:151
+#: sys-utils/lscpu.c:351 sys-utils/lsipc.c:231 sys-utils/lsns.c:187
+#: sys-utils/prlimit.c:277 sys-utils/swapon.c:147 sys-utils/wdctl.c:151
#: sys-utils/zramctl.c:145
#, c-format
msgid "unknown column: %s"
@@ -3433,82 +3434,87 @@ msgstr "неизвестный столбец: %s"
msgid "%s: failed to get partition number"
msgstr "%s: не удалось получить номер раздела"
-#: disk-utils/partx.c:273
+#: disk-utils/partx.c:286 disk-utils/partx.c:324 disk-utils/partx.c:477
+#, c-format
+msgid "specified range <%d:%d> does not make sense"
+msgstr "указанный диапазон <%d:%d> не имеет смысла"
+
+#: disk-utils/partx.c:290
+#, c-format
+msgid "range recount: max partno=%d, lower=%d, upper=%d\n"
+msgstr ""
+
+#: disk-utils/partx.c:297
#, c-format
msgid "%s: error deleting partition %d"
msgstr "%s: ошибка удаления раздела %d"
-#: disk-utils/partx.c:275
+#: disk-utils/partx.c:299
#, c-format
msgid "%s: error deleting partitions %d-%d"
msgstr "%s: ошибка удаления разделов %d-%d"
-#: disk-utils/partx.c:299 disk-utils/partx.c:446 disk-utils/partx.c:974
-#, c-format
-msgid "specified range <%d:%d> does not make sense"
-msgstr "указанный диапазон <%d:%d> не имеет смысла"
-
-#: disk-utils/partx.c:308
+#: disk-utils/partx.c:333
#, c-format
msgid "%s: partition #%d removed\n"
msgstr "%s: раздел #%d удален\n"
-#: disk-utils/partx.c:312
+#: disk-utils/partx.c:337
#, c-format
msgid "%s: partition #%d doesn't exist\n"
msgstr "%s: раздел #%d не существует\n"
-#: disk-utils/partx.c:317
+#: disk-utils/partx.c:342
#, c-format
msgid "%s: deleting partition #%d failed"
msgstr "%s: не удалось удалить раздел #%d"
-#: disk-utils/partx.c:337
+#: disk-utils/partx.c:362
#, c-format
msgid "%s: error adding partition %d"
msgstr "%s: ошибка добавления раздела %d"
-#: disk-utils/partx.c:339
+#: disk-utils/partx.c:364
#, c-format
msgid "%s: error adding partitions %d-%d"
msgstr "%s: ошибка добавления раздела %d-%d"
-#: disk-utils/partx.c:376 disk-utils/partx.c:482
+#: disk-utils/partx.c:405 disk-utils/partx.c:513
#, c-format
msgid "%s: partition #%d added\n"
msgstr "%s: раздел #%d добавлен\n"
-#: disk-utils/partx.c:381
+#: disk-utils/partx.c:410
#, c-format
msgid "%s: adding partition #%d failed"
msgstr "%s: не удалось добавить раздел #%d"
-#: disk-utils/partx.c:416
+#: disk-utils/partx.c:445
#, c-format
msgid "%s: error updating partition %d"
msgstr "%s: ошибка обновления раздела %d"
-#: disk-utils/partx.c:418
+#: disk-utils/partx.c:447
#, c-format
msgid "%s: error updating partitions %d-%d"
msgstr "%s: ошибка обновления разделов %d-%d"
-#: disk-utils/partx.c:455
+#: disk-utils/partx.c:486
#, c-format
msgid "%s: no partition #%d"
msgstr "%s: нет раздела #%d"
-#: disk-utils/partx.c:476
+#: disk-utils/partx.c:507
#, c-format
msgid "%s: partition #%d resized\n"
msgstr "%s: раздел раздела #%d изменен\n"
-#: disk-utils/partx.c:490
+#: disk-utils/partx.c:521
#, c-format
msgid "%s: updating partition #%d failed"
msgstr "%s: не удалось обновить раздел #%d"
-#: disk-utils/partx.c:527
+#: disk-utils/partx.c:562
#, c-format
msgid "#%2d: %9ju-%9ju (%9ju sector, %6ju MB)\n"
msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"
@@ -3516,72 +3522,72 @@ msgstr[0] "#%2d: %9ju-%9ju (%9ju сектор, %6ju МБ)\n"
msgstr[1] "#%2d: %9ju-%9ju (%9ju сектора, %6ju МБ)\n"
msgstr[2] "#%2d: %9ju-%9ju (%9ju секторов, %6ju МБ)\n"
-#: disk-utils/partx.c:546 misc-utils/findmnt.c:713 misc-utils/findmnt.c:730
-#: misc-utils/lslocks.c:382 sys-utils/lsns.c:431
+#: disk-utils/partx.c:581 misc-utils/findmnt.c:713 misc-utils/findmnt.c:730
+#: misc-utils/lslocks.c:382 sys-utils/lsns.c:432
msgid "failed to add line to output"
msgstr "не удалось добавить строку вывода"
-#: disk-utils/partx.c:609
+#: disk-utils/partx.c:644
msgid "failed to add data to output table"
msgstr "не удалось добавить данные в таблицу вывода"
-#: disk-utils/partx.c:632 login-utils/lslogins.c:932 misc-utils/findmnt.c:1583
-#: misc-utils/lsblk.c:1861 misc-utils/lslocks.c:442 sys-utils/losetup.c:310
-#: sys-utils/lscpu.c:1486 sys-utils/lsipc.c:337 sys-utils/lsns.c:486
-#: sys-utils/prlimit.c:297 sys-utils/swapon.c:269 sys-utils/wdctl.c:259
+#: disk-utils/partx.c:667 login-utils/lslogins.c:932 misc-utils/findmnt.c:1583
+#: misc-utils/lsblk.c:1860 misc-utils/lslocks.c:442 sys-utils/losetup.c:310
+#: sys-utils/lscpu.c:1519 sys-utils/lsipc.c:337 sys-utils/lsns.c:487
+#: sys-utils/prlimit.c:297 sys-utils/swapon.c:280 sys-utils/wdctl.c:259
#: sys-utils/zramctl.c:427
msgid "failed to initialize output table"
msgstr "не удалось проинициализировать таблицу вывода"
-#: disk-utils/partx.c:643 misc-utils/findmnt.c:1609 misc-utils/lsblk.c:1883
+#: disk-utils/partx.c:678 misc-utils/findmnt.c:1609 misc-utils/lsblk.c:1882
#: misc-utils/lslocks.c:456 sys-utils/losetup.c:322 sys-utils/losetup.c:358
-#: sys-utils/lscpu.c:1491 sys-utils/lsns.c:507 sys-utils/prlimit.c:306
-#: sys-utils/swapon.c:278 sys-utils/wdctl.c:270 sys-utils/zramctl.c:436
+#: sys-utils/lscpu.c:1524 sys-utils/lsns.c:508 sys-utils/prlimit.c:306
+#: sys-utils/swapon.c:289 sys-utils/wdctl.c:270 sys-utils/zramctl.c:436
msgid "failed to initialize output column"
msgstr "не удалось проинициализировать столбец вывода"
-#: disk-utils/partx.c:683
+#: disk-utils/partx.c:722
#, fuzzy, c-format
msgid "failed to initialize blkid filter for '%s'"
msgstr "Невозможно выделить буфер.\n"
-#: disk-utils/partx.c:691
+#: disk-utils/partx.c:730
#, c-format
msgid "%s: failed to read partition table"
msgstr "%s: не удалось перечитать таблицу разделов"
-#: disk-utils/partx.c:697
+#: disk-utils/partx.c:736
#, c-format
msgid "%s: partition table type '%s' detected\n"
msgstr "%s: обнаружена таблица разделов '%s'\n"
-#: disk-utils/partx.c:701
+#: disk-utils/partx.c:740
#, c-format
msgid "%s: partition table with no partitions"
msgstr "%s: таблица разделов без единого раздела"
-#: disk-utils/partx.c:713
+#: disk-utils/partx.c:752
#, c-format
msgid " %s [-a|-d|-s|-u] [--nr <n:m> | <partition>] <disk>\n"
msgstr " %s [-a|-d|-s|-u] [--nr <n:m> | <раздел>] <диск>\n"
-#: disk-utils/partx.c:717
+#: disk-utils/partx.c:756
msgid "Tell the kernel about the presence and numbering of partitions.\n"
msgstr "Передать команду ядру о существовании и порядке следования разделов\n"
-#: disk-utils/partx.c:720
+#: disk-utils/partx.c:759
msgid " -a, --add add specified partitions or all of them\n"
msgstr " -a, --add добавить указанный раздел или все разделы\n"
-#: disk-utils/partx.c:721
+#: disk-utils/partx.c:760
msgid " -d, --delete delete specified partitions or all of them\n"
msgstr " -d, --delete удалить указанный раздел или все разделы\n"
-#: disk-utils/partx.c:722
+#: disk-utils/partx.c:761
msgid " -u, --update update specified partitions or all of them\n"
msgstr " -u, --update обновить указанный раздел или все разделы\n"
-#: disk-utils/partx.c:723
+#: disk-utils/partx.c:762
msgid ""
" -s, --show list partitions\n"
"\n"
@@ -3589,41 +3595,41 @@ msgstr ""
" -s, --show список разделов\n"
"\n"
-#: disk-utils/partx.c:724 misc-utils/lsblk.c:1615
+#: disk-utils/partx.c:763 misc-utils/lsblk.c:1614
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr ""
-#: disk-utils/partx.c:725
+#: disk-utils/partx.c:764
msgid " -g, --noheadings don't print headings for --show\n"
msgstr " -g, --noheadings не выводить заголовки для параметра --show\n"
-#: disk-utils/partx.c:726
+#: disk-utils/partx.c:765
msgid " -n, --nr <n:m> specify the range of partitions (e.g. --nr 2:4)\n"
msgstr " -n, --nr <n:m> задать диапазон разделов (напр., --nr 2:4)\n"
-#: disk-utils/partx.c:727
+#: disk-utils/partx.c:766
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <list> выбрать выводимые столбцы\n"
-#: disk-utils/partx.c:728 misc-utils/lsblk.c:1629
+#: disk-utils/partx.c:767 misc-utils/lsblk.c:1628
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs выводить в формате ключ=\"значение\"\n"
-#: disk-utils/partx.c:729 misc-utils/lsblk.c:1630
+#: disk-utils/partx.c:768 misc-utils/lsblk.c:1629
msgid " -r, --raw use raw output format\n"
msgstr ""
" -r, --raw выводить в \"сыром\" формате\n"
"\n"
-#: disk-utils/partx.c:730
+#: disk-utils/partx.c:769
msgid " -t, --type <type> specify the partition type (dos, bsd, solaris, etc.)\n"
msgstr " -t, --type <type> задать тип раздела (dos, bsd, solaris, etc.)\n"
-#: disk-utils/partx.c:731 sys-utils/fallocate.c:91
+#: disk-utils/partx.c:770 sys-utils/fallocate.c:91
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose режим подробного вывода\n"
-#: disk-utils/partx.c:737
+#: disk-utils/partx.c:776
msgid ""
"\n"
"Available columns (for --show, --raw or --pairs):\n"
@@ -3631,30 +3637,35 @@ msgstr ""
"\n"
"Доступные столбцы (для параметров --show, --raw или --pairs):\n"
-#: disk-utils/partx.c:810
+#: disk-utils/partx.c:849
msgid "failed to parse --nr <M-N> range"
msgstr "не удалось распознать диапазон --nr <M-N>"
-#: disk-utils/partx.c:910
+#: disk-utils/partx.c:924
+#, fuzzy
+msgid "partition and disk name do not match"
+msgstr "Таблица разделов не изменена (--no-act)."
+
+#: disk-utils/partx.c:952
msgid "--nr and <partition> are mutually exclusive"
msgstr "параметры --nr и <partition> взаимоисключающие"
-#: disk-utils/partx.c:929
+#: disk-utils/partx.c:971
#, c-format
msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
msgstr "раздел: %s, диск: %s, ниж.: %d, верх.: %d\n"
-#: disk-utils/partx.c:941
+#: disk-utils/partx.c:983
#, c-format
msgid "%s: cannot delete partitions"
msgstr "%s: невозможно удалить разделы"
-#: disk-utils/partx.c:944
+#: disk-utils/partx.c:986
#, c-format
msgid "%s: partitioned loop devices unsupported"
msgstr ""
-#: disk-utils/partx.c:961
+#: disk-utils/partx.c:1003
#, fuzzy, c-format
msgid "%s: failed to initialize blkid prober"
msgstr "Невозможно выделить буфер.\n"
@@ -3790,35 +3801,36 @@ msgstr "Резервные файлы:"
#: disk-utils/sfdisk.c:375
#, fuzzy
-msgid "failed to read new partition from device (ignore --move-data)"
+msgid "failed to read new partition from device; ignoring --move-data"
msgstr "Не удалось прочитать расширенную таблицу разделов (смещение=%ju)"
#: disk-utils/sfdisk.c:377
#, fuzzy
-msgid "failed to get size of the new partition (ignore --move-data)"
+msgid "failed to get size of the new partition; ignoring --move-data"
msgstr "%s: не удалось определить начало раздела %s"
#: disk-utils/sfdisk.c:379
#, fuzzy
-msgid "failed to get start of the new partition (ignore --move-data)"
+msgid "failed to get start of the new partition; ignoring --move-data"
msgstr "%s: не удалось определить начало раздела %s"
#: disk-utils/sfdisk.c:381
#, fuzzy
-msgid "failed to get size of the old partition (ignore --move-data)"
+msgid "failed to get size of the old partition; ignoring --move-data"
msgstr "%s: не удалось определить начало раздела %s"
#: disk-utils/sfdisk.c:383
#, fuzzy
-msgid "failed to get start of the old partition (ignore --move-data)"
+msgid "failed to get start of the old partition; ignoring --move-data"
msgstr "%s: не удалось определить начало раздела %s"
#: disk-utils/sfdisk.c:385
-msgid "begin of the partition has not been moved (ignore --move-data)"
-msgstr ""
+#, fuzzy
+msgid "start of the partition has not been moved; ignoring --move-data"
+msgstr "%s: не удалось определить начало раздела %s"
#: disk-utils/sfdisk.c:387
-msgid "new partition is smaller than original (ignore --move-data)"
+msgid "new partition is smaller than original; ignoring --move-data"
msgstr ""
#: disk-utils/sfdisk.c:437
@@ -5104,7 +5116,7 @@ msgstr "Загрузчик установлен на %s."
#: libfdisk/src/bsd.c:900
#, c-format
-msgid "Disklabel written to %s (don't forget to write %s disklable too)."
+msgid "Disklabel written to %s. (Don't forget to write the %s disklabel too.)"
msgstr ""
#: libfdisk/src/bsd.c:903
@@ -5895,12 +5907,12 @@ msgstr "Имя раздела изменено с '%s' на '%.*s'."
#: libfdisk/src/gpt.c:1748
#, fuzzy
-msgid "The begin of the partition overflows FirstUsableLBA."
+msgid "The start of the partition understeps FirstUsableLBA."
msgstr "Загрузочный раздел не существует."
#: libfdisk/src/gpt.c:1755
#, fuzzy
-msgid "The end of the partition overflows LastUsableLBA."
+msgid "The end of the partition oversteps LastUsableLBA."
msgstr "конец раздела в секторах"
#: libfdisk/src/gpt.c:1914
@@ -6539,7 +6551,7 @@ msgstr ""
msgid "waitpid failed (%s)"
msgstr "выполнение waitpid завершилось неудачей (%s)"
-#: lib/path.c:209 sys-utils/lscpu.c:1591
+#: lib/path.c:209 sys-utils/lscpu.c:1624
#, fuzzy
msgid "failed to callocate cpu set"
msgstr "Невозможно выделить буфер.\n"
@@ -7013,7 +7025,7 @@ msgstr "Невозможно инициализировать PAM: %s"
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "СБОЙ ВХОДА %u ИЗ %s ДЛЯ %s, %s"
-#: login-utils/login.c:824 login-utils/sulogin.c:1048
+#: login-utils/login.c:824 login-utils/sulogin.c:1052
#, c-format
msgid ""
"Login incorrect\n"
@@ -7102,12 +7114,12 @@ msgstr "Вам письмо.\n"
msgid "setuid() failed"
msgstr "setuid() завершился неудачей"
-#: login-utils/login.c:1327 login-utils/sulogin.c:763
+#: login-utils/login.c:1327 login-utils/sulogin.c:767
#, c-format
msgid "%s: change directory failed"
msgstr "%s: не удалось перейти в каталог"
-#: login-utils/login.c:1334 login-utils/sulogin.c:764
+#: login-utils/login.c:1334 login-utils/sulogin.c:768
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "Вход в систему с домашним каталогом = \"/\".\n"
@@ -7129,7 +7141,7 @@ msgstr "%s: %s содержит недопустимое числовое зна
msgid "hush login status: restore original IDs failed"
msgstr ""
-#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1313 sys-utils/lscpu.c:1323
+#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1346 sys-utils/lscpu.c:1356
msgid "no"
msgstr "нет"
@@ -7368,7 +7380,7 @@ msgstr ""
#: login-utils/lslogins.c:1238 login-utils/nologin.c:26
#: misc-utils/lslocks.c:492 misc-utils/mcookie.c:82 misc-utils/uuidd.c:70
#: misc-utils/uuidgen.c:25 sys-utils/dmesg.c:264 sys-utils/ipcmk.c:66
-#: sys-utils/lscpu.c:1705 sys-utils/lsipc.c:276 sys-utils/readprofile.c:104
+#: sys-utils/lscpu.c:1738 sys-utils/lsipc.c:276 sys-utils/readprofile.c:104
#: sys-utils/rtcwake.c:94 term-utils/setterm.c:388 text-utils/line.c:30
#, c-format
msgid " %s [options]\n"
@@ -7464,7 +7476,7 @@ msgid " --btmp-file <path> set an alternate path for btmp\n"
msgstr " --btmp-file <path> установить путь для wtmp\n"
#: login-utils/lslogins.c:1269 misc-utils/findmnt.c:1263
-#: sys-utils/lscpu.c:1722
+#: sys-utils/lscpu.c:1755
#, c-format
msgid ""
"\n"
@@ -7493,7 +7505,7 @@ msgstr "ошибка вызова getline()"
msgid "Password: "
msgstr "Пароль: "
-#: login-utils/newgrp.c:154 login-utils/sulogin.c:1030
+#: login-utils/newgrp.c:154 login-utils/sulogin.c:1034
msgid "crypt failed"
msgstr "шифрование завершилось неудачей"
@@ -7510,7 +7522,7 @@ msgstr ""
msgid "who are you?"
msgstr "кто вы?"
-#: login-utils/newgrp.c:211 login-utils/newgrp.c:223 sys-utils/nsenter.c:400
+#: login-utils/newgrp.c:211 login-utils/newgrp.c:223 sys-utils/nsenter.c:409
msgid "setgid failed"
msgstr "setgid завершился неудачей"
@@ -7518,11 +7530,11 @@ msgstr "setgid завершился неудачей"
msgid "no such group"
msgstr "нет такой группы."
-#: login-utils/newgrp.c:221 sys-utils/mount.c:480
+#: login-utils/newgrp.c:221 sys-utils/mount.c:479
msgid "permission denied"
msgstr "доступ запрещен"
-#: login-utils/newgrp.c:227 sys-utils/nsenter.c:402
+#: login-utils/newgrp.c:227 sys-utils/nsenter.c:411
msgid "setuid failed"
msgstr "setuid() завершился неудачей"
@@ -7718,32 +7730,32 @@ msgstr ""
msgid "warning: cannot change directory to %s"
msgstr "предупреждение: не могу поменять каталог на %s"
-#: login-utils/sulogin.c:159
+#: login-utils/sulogin.c:164
#, fuzzy
msgid "tcgetattr failed"
msgstr "(Следующий файл: %s)"
-#: login-utils/sulogin.c:236
+#: login-utils/sulogin.c:241
#, fuzzy
msgid "tcsetattr failed"
msgstr "(Следующий файл: %s)"
-#: login-utils/sulogin.c:501
+#: login-utils/sulogin.c:506
#, fuzzy, c-format
msgid "%s: no entry for root\n"
msgstr "%s: не открыт для чтения/записи"
-#: login-utils/sulogin.c:528
+#: login-utils/sulogin.c:533
#, fuzzy, c-format
msgid "%s: no entry for root"
msgstr "%s: не открыт для чтения/записи"
-#: login-utils/sulogin.c:533
+#: login-utils/sulogin.c:538
#, fuzzy, c-format
msgid "%s: root password garbled"
msgstr "%s: файл паролей занят.\n"
-#: login-utils/sulogin.c:561
+#: login-utils/sulogin.c:566
#, c-format
msgid ""
"\n"
@@ -7753,49 +7765,49 @@ msgid ""
"Press Enter to continue.\n"
msgstr ""
-#: login-utils/sulogin.c:567
+#: login-utils/sulogin.c:572
#, c-format
msgid "Give root password for login: "
msgstr "Для входа введите пароль root: "
-#: login-utils/sulogin.c:569
+#: login-utils/sulogin.c:574
#, c-format
msgid "Press Enter for login: "
msgstr "Нажмите Enter для входа"
-#: login-utils/sulogin.c:572
+#: login-utils/sulogin.c:577
#, c-format
msgid "Give root password for maintenance\n"
msgstr "Для продолжения введите пароль root\n"
-#: login-utils/sulogin.c:574
+#: login-utils/sulogin.c:579
#, c-format
msgid "Press Enter for maintenance\n"
msgstr "Для продолжения нажмите Enter\n"
-#: login-utils/sulogin.c:575
+#: login-utils/sulogin.c:580
#, c-format
msgid "(or press Control-D to continue): "
msgstr "(или нажмите Control-D для продолжения): "
-#: login-utils/sulogin.c:767
+#: login-utils/sulogin.c:771
msgid "change directory to system root failed"
msgstr "не удалось сменить директорию на корневую"
-#: login-utils/sulogin.c:816
+#: login-utils/sulogin.c:820
msgid "setexeccon failed"
msgstr "выполнение setexeccon завершилось неудачей"
-#: login-utils/sulogin.c:836
+#: login-utils/sulogin.c:840
#, fuzzy, c-format
msgid " %s [options] [tty device]\n"
msgstr "Использование: %s [опции] устройство...\n"
-#: login-utils/sulogin.c:839
+#: login-utils/sulogin.c:843
msgid "Single-user login.\n"
msgstr "Однопользовательский вход.\n"
-#: login-utils/sulogin.c:842
+#: login-utils/sulogin.c:846
msgid ""
" -p, --login-shell start a login shell\n"
" -t, --timeout <seconds> max time to wait for a password (default: no limit)\n"
@@ -7805,24 +7817,24 @@ msgstr ""
" -t, --timeout <seconds> максимальное время ожидания ввода пароля (по умолчанию - без ограничения)\n"
" -e, --force прочитать файлы password непосредственно если getpwnam(3) завершается неудачно\n"
-#: login-utils/sulogin.c:896 misc-utils/findmnt.c:1472 sys-utils/wdctl.c:523
+#: login-utils/sulogin.c:900 misc-utils/findmnt.c:1472 sys-utils/wdctl.c:523
#: term-utils/wall.c:135
msgid "invalid timeout argument"
msgstr "недопустимый аргумент timeout"
-#: login-utils/sulogin.c:918
+#: login-utils/sulogin.c:922
msgid "only superuser can run this program"
msgstr "эту программу может запустить только суперпользователь"
-#: login-utils/sulogin.c:961
+#: login-utils/sulogin.c:965
msgid "cannot open console"
msgstr "невозможно открыть консоль"
-#: login-utils/sulogin.c:968
+#: login-utils/sulogin.c:972
msgid "cannot open password database"
msgstr "Невозможно открыть базу паролей"
-#: login-utils/sulogin.c:1045
+#: login-utils/sulogin.c:1049
#, c-format
msgid ""
"Can not execute su shell\n"
@@ -7831,7 +7843,7 @@ msgstr ""
"Невозможно выполнить su shell\n"
"\n"
-#: login-utils/sulogin.c:1052
+#: login-utils/sulogin.c:1056
msgid ""
"Timed out\n"
"\n"
@@ -7839,7 +7851,7 @@ msgstr ""
"время ожидания истекло\n"
"\n"
-#: login-utils/sulogin.c:1084
+#: login-utils/sulogin.c:1088
#, fuzzy
msgid ""
"Can not wait on su shell\n"
@@ -7939,18 +7951,16 @@ msgid "Edit the password or group file.\n"
msgstr ""
#: login-utils/vipw.c:347
-#, c-format
msgid "You are using shadow groups on this system.\n"
msgstr "Вы используете теневые группы на этой системе.\n"
#: login-utils/vipw.c:348
-#, c-format
msgid "You are using shadow passwords on this system.\n"
msgstr "Вы используете теневые пароли на этой системе.\n"
#. TRANSLATORS: this program uses for y and n rpmatch(3),
#. * which means they can be translated.
-#: login-utils/vipw.c:351
+#: login-utils/vipw.c:352
#, c-format
msgid "Would you like to edit %s now [y/n]? "
msgstr "Хотите ли вы сейчас отредактировать %s [д/н]? "
@@ -8201,13 +8211,8 @@ msgstr "перемонтировать"
msgid "move"
msgstr "переместить"
-#: misc-utils/findmnt.c:807
-#, c-format
-msgid "%s: parse error at line %d"
-msgstr "%s: ошибка разбора в строке %d"
-
#: misc-utils/findmnt.c:836 misc-utils/findmnt.c:1099 sys-utils/eject.c:719
-#: sys-utils/mount.c:653
+#: sys-utils/mount.c:652
msgid "failed to initialize libmount table"
msgstr "ошибка инициализации libmount table"
@@ -8217,9 +8222,9 @@ msgid "can't read %s"
msgstr "не удаётся прочитать %s"
#: misc-utils/findmnt.c:1039 misc-utils/findmnt.c:1105 sys-utils/fstrim.c:199
-#: sys-utils/mount.c:135 sys-utils/mount.c:183 sys-utils/swapoff.c:56
-#: sys-utils/swapoff.c:152 sys-utils/swapon.c:233 sys-utils/swapon.c:263
-#: sys-utils/swapon.c:693 sys-utils/umount.c:275
+#: sys-utils/mount.c:134 sys-utils/mount.c:182 sys-utils/swapoff.c:56
+#: sys-utils/swapoff.c:152 sys-utils/swapon.c:244 sys-utils/swapon.c:274
+#: sys-utils/swapon.c:732 sys-utils/umount.c:274
msgid "failed to initialize libmount iterator"
msgstr "ошибка инициализации libmount iterator"
@@ -8317,12 +8322,12 @@ msgstr ""
msgid " -i, --invert invert the sense of matching\n"
msgstr ""
-#: misc-utils/findmnt.c:1241 misc-utils/lslocks.c:498 sys-utils/lsns.c:594
+#: misc-utils/findmnt.c:1241 misc-utils/lslocks.c:498 sys-utils/lsns.c:595
#, fuzzy
msgid " -J, --json use JSON output format\n"
msgstr " -V, --version Вывод информации о версии\n"
-#: misc-utils/findmnt.c:1242 sys-utils/lsns.c:595
+#: misc-utils/findmnt.c:1242 sys-utils/lsns.c:596
#, fuzzy
msgid " -l, --list use list format output\n"
msgstr " -Q, --quiet-output Без обычных выходных данных\n"
@@ -8382,7 +8387,7 @@ msgstr " l список типов известных файловых си
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr ""
-#: misc-utils/findmnt.c:1256 misc-utils/lslocks.c:503 sys-utils/lsns.c:600
+#: misc-utils/findmnt.c:1256 misc-utils/lslocks.c:503 sys-utils/lsns.c:601
msgid " -u, --notruncate don't truncate text in columns\n"
msgstr ""
@@ -8629,196 +8634,196 @@ msgstr "невозможно переименовать %s в %s: %s\n"
msgid "failed to connect to %s port %s"
msgstr "не удалось подключиться к %s, порт %s"
-#: misc-utils/logger.c:353
+#: misc-utils/logger.c:355
#, c-format
msgid "maximum input lines (%d) exceeded"
msgstr ""
-#: misc-utils/logger.c:488
+#: misc-utils/logger.c:490
#, fuzzy
msgid "send message failed"
msgstr "setuid() завершился неудачей"
-#: misc-utils/logger.c:559
+#: misc-utils/logger.c:561
#, c-format
msgid "structured data ID '%s' is not unique"
msgstr ""
-#: misc-utils/logger.c:573
+#: misc-utils/logger.c:575
#, c-format
-msgid "--sd-id no specified for --sd-param %s"
+msgid "--sd-id was not specified for --sd-param %s"
msgstr ""
-#: misc-utils/logger.c:744
+#: misc-utils/logger.c:746
#, fuzzy
msgid "localtime() failed"
msgstr "malloc завершился неудачей"
-#: misc-utils/logger.c:754
+#: misc-utils/logger.c:756
#, c-format
msgid "hostname '%s' is too long"
msgstr "слишком длинное имя хоста '%s'"
-#: misc-utils/logger.c:760
+#: misc-utils/logger.c:762
#, fuzzy, c-format
msgid "tag '%s' is too long"
msgstr "поле слишком длинное.\n"
-#: misc-utils/logger.c:823
+#: misc-utils/logger.c:825
#, c-format
msgid "ignoring unknown option argument: %s"
msgstr "игнорирование неизвестного аргумента параметра: %s"
-#: misc-utils/logger.c:835
+#: misc-utils/logger.c:837
#, fuzzy, c-format
msgid "invalid argument: %s: using automatic errors"
msgstr "неверный id: %s\n"
-#: misc-utils/logger.c:984
+#: misc-utils/logger.c:986
#, fuzzy, c-format
msgid " %s [options] [<message>]\n"
msgstr "использование: %s программа [аргумент ...]\n"
-#: misc-utils/logger.c:987
+#: misc-utils/logger.c:989
#, fuzzy
msgid "Enter messages into the system log.\n"
msgstr "Невозможно установить системные часы.\n"
-#: misc-utils/logger.c:990
+#: misc-utils/logger.c:992
#, fuzzy
msgid " -i log the logger command's PID\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: misc-utils/logger.c:991
+#: misc-utils/logger.c:993
msgid " --id[=<id>] log the given <id>, or otherwise the PID\n"
msgstr ""
-#: misc-utils/logger.c:992
+#: misc-utils/logger.c:994
#, fuzzy
msgid " -f, --file <file> log the contents of this file\n"
msgstr " -e не делать паузу в конце файла\n"
-#: misc-utils/logger.c:993
+#: misc-utils/logger.c:995
#, fuzzy
msgid " -e, --skip-empty do not log empty lines when processing files\n"
msgstr " -n, --skip-login не показывать приглашение для входа\n"
-#: misc-utils/logger.c:994
+#: misc-utils/logger.c:996
#, fuzzy
msgid " --no-act do everything except the write the log\n"
msgstr " --nohints не показывать советы\n"
-#: misc-utils/logger.c:995
+#: misc-utils/logger.c:997
msgid " -p, --priority <prio> mark given message with this priority\n"
msgstr ""
-#: misc-utils/logger.c:996
+#: misc-utils/logger.c:998
msgid " --octet-count use rfc6587 octet counting\n"
msgstr ""
-#: misc-utils/logger.c:997
+#: misc-utils/logger.c:999
msgid " --prio-prefix look for a prefix on every line read from stdin\n"
msgstr ""
-#: misc-utils/logger.c:998
+#: misc-utils/logger.c:1000
#, fuzzy
msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s выводить сообщения на стандартный вывод\n"
-#: misc-utils/logger.c:999
+#: misc-utils/logger.c:1001
msgid " -S, --size <size> maximum size for a single message\n"
msgstr " -S, --size <size> максимальный размер одного сообщения\n"
-#: misc-utils/logger.c:1000
+#: misc-utils/logger.c:1002
msgid " -t, --tag <tag> mark every line with this tag\n"
msgstr ""
-#: misc-utils/logger.c:1001
+#: misc-utils/logger.c:1003
msgid " -n, --server <name> write to this remote syslog server\n"
msgstr ""
-#: misc-utils/logger.c:1002
+#: misc-utils/logger.c:1004
msgid " -P, --port <number> use this UDP port\n"
msgstr " -P, --port <number> использовать этот UDP-порт\n"
-#: misc-utils/logger.c:1003
+#: misc-utils/logger.c:1005
msgid " -T, --tcp use TCP only\n"
msgstr " -T, --tcp использовать только TCP\n"
-#: misc-utils/logger.c:1004
+#: misc-utils/logger.c:1006
msgid " -d, --udp use UDP only\n"
msgstr " -d, --udp использовать только UDP\n"
-#: misc-utils/logger.c:1005
+#: misc-utils/logger.c:1007
msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
msgstr ""
-#: misc-utils/logger.c:1006
+#: misc-utils/logger.c:1008
msgid ""
" --rfc5424[=<snip>] use the syslog protocol (the default for remote);\n"
" <snip> can be notime, or notq, and/or nohost\n"
msgstr ""
-#: misc-utils/logger.c:1008
+#: misc-utils/logger.c:1010
msgid " --sd-id <id> rfc5424 structured data ID\n"
msgstr ""
-#: misc-utils/logger.c:1009
+#: misc-utils/logger.c:1011
msgid " --sd-param <data> rfc5424 structured data name=value\n"
msgstr ""
-#: misc-utils/logger.c:1010
+#: misc-utils/logger.c:1012
msgid " --msgid <msgid> set rfc5424 message id field\n"
msgstr ""
-#: misc-utils/logger.c:1011
+#: misc-utils/logger.c:1013
msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr ""
-#: misc-utils/logger.c:1012
+#: misc-utils/logger.c:1014
msgid ""
" --socket-errors[=<on|off|auto>]\n"
" print connection errors when using Unix sockets\n"
msgstr ""
-#: misc-utils/logger.c:1015
+#: misc-utils/logger.c:1017
msgid " --journald[=<file>] write journald entry\n"
msgstr ""
-#: misc-utils/logger.c:1102
+#: misc-utils/logger.c:1104
#, c-format
msgid "file %s"
msgstr "файл %s"
-#: misc-utils/logger.c:1117
+#: misc-utils/logger.c:1119
#, fuzzy
msgid "failed to parse id"
msgstr "не удалось определить идентификатор процесса"
-#: misc-utils/logger.c:1135
+#: misc-utils/logger.c:1137
#, fuzzy
msgid "failed to parse message size"
msgstr "%s: невозможно открыть : %s\n"
-#: misc-utils/logger.c:1170
+#: misc-utils/logger.c:1172
msgid "--msgid cannot contain space"
msgstr "--msgid не может содержать пробела"
-#: misc-utils/logger.c:1192
+#: misc-utils/logger.c:1194
#, fuzzy, c-format
msgid "invalid structured data ID: '%s'"
msgstr "неверный id: %s\n"
-#: misc-utils/logger.c:1197
+#: misc-utils/logger.c:1199
#, fuzzy, c-format
msgid "invalid structured data parameter: '%s'"
msgstr "неверное значение тайм-аута: %s"
-#: misc-utils/logger.c:1208
+#: misc-utils/logger.c:1210
msgid "--file <file> and <message> are mutually exclusive, message is ignored"
msgstr ""
-#: misc-utils/logger.c:1215
+#: misc-utils/logger.c:1217
msgid "journald entry could not be written"
msgstr ""
@@ -9001,136 +9006,130 @@ msgstr "ревизия устройства"
msgid "device vendor"
msgstr "производитель устройства"
-#: misc-utils/lsblk.c:433 sys-utils/mount.c:102 sys-utils/swapon-common.c:19
-#: sys-utils/umount.c:46
-#, fuzzy, c-format
-msgid "%s: parse error: ignore entry at line %d."
-msgstr "последняя первая строка"
-
-#: misc-utils/lsblk.c:1268
+#: misc-utils/lsblk.c:1267
msgid "failed to open device directory in sysfs"
msgstr ""
-#: misc-utils/lsblk.c:1454
+#: misc-utils/lsblk.c:1453
#, fuzzy, c-format
msgid "%s: failed to compose sysfs path"
msgstr "%s: невозможно открыть : %s\n"
-#: misc-utils/lsblk.c:1460
+#: misc-utils/lsblk.c:1459
#, c-format
msgid "%s: failed to read link"
msgstr "%s: не удалось прочитать ссылку"
-#: misc-utils/lsblk.c:1482
+#: misc-utils/lsblk.c:1481
#, fuzzy, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s: невозможно открыть : %s\n"
-#: misc-utils/lsblk.c:1491
+#: misc-utils/lsblk.c:1490
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr ""
-#: misc-utils/lsblk.c:1543 misc-utils/lsblk.c:1545 misc-utils/lsblk.c:1570
-#: misc-utils/lsblk.c:1572
+#: misc-utils/lsblk.c:1542 misc-utils/lsblk.c:1544 misc-utils/lsblk.c:1569
+#: misc-utils/lsblk.c:1571
#, fuzzy, c-format
msgid "failed to parse list '%s'"
msgstr "%s: невозможно открыть : %s\n"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1550
+#: misc-utils/lsblk.c:1549
#, c-format
msgid "the list of excluded devices is too large (limit is %d devices)"
msgstr "список исключенных устройств слишком велик (предел - %d устройств)"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1577
+#: misc-utils/lsblk.c:1576
#, c-format
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "список включенных устройств слишком велик (предел - %d устройств)"
-#: misc-utils/lsblk.c:1608 sys-utils/wdctl.c:174
+#: misc-utils/lsblk.c:1607 sys-utils/wdctl.c:174
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [параметры] [<устройство> ...]\n"
-#: misc-utils/lsblk.c:1611
+#: misc-utils/lsblk.c:1610
msgid "List information about block devices.\n"
msgstr "Вывести информацию о блочных устройствах.\n"
-#: misc-utils/lsblk.c:1614
+#: misc-utils/lsblk.c:1613
msgid " -a, --all print all devices\n"
msgstr " -a, --all показать все устройства\n"
-#: misc-utils/lsblk.c:1616
+#: misc-utils/lsblk.c:1615
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr ""
-#: misc-utils/lsblk.c:1617
+#: misc-utils/lsblk.c:1616
msgid " -D, --discard print discard capabilities\n"
msgstr ""
-#: misc-utils/lsblk.c:1618
+#: misc-utils/lsblk.c:1617
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr ""
-#: misc-utils/lsblk.c:1619
+#: misc-utils/lsblk.c:1618
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs показать информацию о файловых системах\n"
-#: misc-utils/lsblk.c:1620
+#: misc-utils/lsblk.c:1619
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii использовать только ASCII-символы\n"
-#: misc-utils/lsblk.c:1621
+#: misc-utils/lsblk.c:1620
msgid " -I, --include <list> show only devices with specified major numbers\n"
msgstr ""
-#: misc-utils/lsblk.c:1622
+#: misc-utils/lsblk.c:1621
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json использовать для вывода формат JSON\n"
-#: misc-utils/lsblk.c:1623
+#: misc-utils/lsblk.c:1622
msgid " -l, --list use list format output\n"
msgstr " -l, --list показать данные в виде списка\n"
-#: misc-utils/lsblk.c:1624
+#: misc-utils/lsblk.c:1623
msgid " -m, --perms output info about permissions\n"
msgstr " -m, --perms показать информацию о разрешениях\n"
-#: misc-utils/lsblk.c:1625
+#: misc-utils/lsblk.c:1624
msgid " -n, --noheadings don't print headings\n"
msgstr ""
-#: misc-utils/lsblk.c:1626
+#: misc-utils/lsblk.c:1625
msgid " -o, --output <list> output columns\n"
msgstr ""
-#: misc-utils/lsblk.c:1627
+#: misc-utils/lsblk.c:1626
msgid " -O, --output-all output all columns\n"
msgstr " -O, --output-all выводить все столбцы\n"
-#: misc-utils/lsblk.c:1628
+#: misc-utils/lsblk.c:1627
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths печатать полный путь к устройству\n"
-#: misc-utils/lsblk.c:1631
+#: misc-utils/lsblk.c:1630
msgid " -s, --inverse inverse dependencies\n"
msgstr ""
-#: misc-utils/lsblk.c:1632
+#: misc-utils/lsblk.c:1631
msgid " -S, --scsi output info about SCSI devices\n"
msgstr " -S, --scsi вывести информацию об устройствах SCSI\n"
-#: misc-utils/lsblk.c:1633
+#: misc-utils/lsblk.c:1632
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology вывести информацию о топологии\n"
-#: misc-utils/lsblk.c:1634
+#: misc-utils/lsblk.c:1633
msgid " -x, --sort <column> sort output by <column>\n"
msgstr ""
-#: misc-utils/lsblk.c:1639 misc-utils/lslocks.c:509 sys-utils/lsns.c:607
+#: misc-utils/lsblk.c:1638 misc-utils/lslocks.c:509 sys-utils/lsns.c:608
#: sys-utils/prlimit.c:196 sys-utils/zramctl.c:487
#, c-format
msgid ""
@@ -9140,7 +9139,7 @@ msgstr ""
"\n"
"Доступные столбцы (для --output):\n"
-#: misc-utils/lsblk.c:1652
+#: misc-utils/lsblk.c:1651
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "не удалось получить доступ к каталогу sysfs: %s"
@@ -9189,7 +9188,7 @@ msgstr "идентификатор процесса, блокирующего д
msgid "failed to parse ID"
msgstr "не удалось определить идентификатор"
-#: misc-utils/lslocks.c:264 sys-utils/nsenter.c:227
+#: misc-utils/lslocks.c:264 sys-utils/nsenter.c:230
msgid "failed to parse pid"
msgstr "не удалось определить идентификатор процесса"
@@ -9210,12 +9209,12 @@ msgstr "не удалось определить конец"
msgid "List local system locks.\n"
msgstr "Невозможно установить системные часы.\n"
-#: misc-utils/lslocks.c:499 sys-utils/lsns.c:596
+#: misc-utils/lslocks.c:499 sys-utils/lsns.c:597
#, fuzzy
msgid " -n, --noheadings don't print headings\n"
msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
-#: misc-utils/lslocks.c:500 sys-utils/lsns.c:597
+#: misc-utils/lslocks.c:500 sys-utils/lsns.c:598
msgid " -o, --output <list> define which output columns to use\n"
msgstr ""
@@ -9223,13 +9222,13 @@ msgstr ""
msgid " -p, --pid <pid> display only locks held by this process\n"
msgstr ""
-#: misc-utils/lslocks.c:502 sys-utils/lsns.c:599
+#: misc-utils/lslocks.c:502 sys-utils/lsns.c:600
#, fuzzy
msgid " -r, --raw use the raw output format\n"
msgstr " -V, --version Вывод информации о версии\n"
#: misc-utils/lslocks.c:556 schedutils/chrt.c:440 schedutils/ionice.c:177
-#: schedutils/taskset.c:163 sys-utils/lsns.c:674 sys-utils/prlimit.c:586
+#: schedutils/taskset.c:163 sys-utils/lsns.c:675 sys-utils/prlimit.c:586
msgid "invalid PID argument"
msgstr "недопустимый аргумент PID"
@@ -9314,7 +9313,7 @@ msgstr ""
msgid "pathname argument is missing"
msgstr "отсутствует аргумент пути"
-#: misc-utils/namei.c:414 sys-utils/lsns.c:739
+#: misc-utils/namei.c:414 sys-utils/lsns.c:740
#, fuzzy
msgid "failed to allocate UID cache"
msgstr "не удалось определить заголовок GPT"
@@ -9485,9 +9484,9 @@ msgstr ""
"время ожидания истекло\n"
"\n"
-#: misc-utils/uuidd.c:345
+#: misc-utils/uuidd.c:345 sys-utils/flock.c:253
#, fuzzy
-msgid "cannot not setup timer"
+msgid "cannot set up timer"
msgstr "невозможно открыть %s"
#: misc-utils/uuidd.c:353
@@ -10624,17 +10623,17 @@ msgstr ""
#: sys-utils/dmesg.c:292
#, fuzzy
-msgid " -T, --ctime show human readable timestamp (may be inaccurate!)\n"
+msgid " -T, --ctime show human-readable timestamp (may be inaccurate!)\n"
msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
#: sys-utils/dmesg.c:293
#, fuzzy
-msgid " -t, --notime don't print messages timestamp\n"
+msgid " -t, --notime don't show any timestamp with messages\n"
msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
#: sys-utils/dmesg.c:294
msgid ""
-" --time-format <format> show time stamp using format:\n"
+" --time-format <format> show timestamp using the given format:\n"
" [delta|reltime|ctime|notime|iso]\n"
"Suspending/resume will make ctime and iso timestamps inaccurate.\n"
msgstr ""
@@ -10899,8 +10898,8 @@ msgstr "невозможно перемотать устройство для с
msgid "device name is `%s'"
msgstr "имя устройства - `%s'"
-#: sys-utils/eject.c:894 sys-utils/umount.c:207 sys-utils/umount.c:236
-#: sys-utils/umount.c:410 sys-utils/umount.c:433
+#: sys-utils/eject.c:894 sys-utils/umount.c:206 sys-utils/umount.c:235
+#: sys-utils/umount.c:409 sys-utils/umount.c:432
#, c-format
msgid "%s: not mounted"
msgstr "%s: не примонтирован"
@@ -11179,11 +11178,6 @@ msgstr "испорченный дескриптор файла"
msgid "requires file descriptor, file or directory"
msgstr ""
-#: sys-utils/flock.c:253
-#, fuzzy
-msgid "cannot set up timer"
-msgstr "невозможно открыть %s"
-
#: sys-utils/flock.c:263
#, fuzzy
msgid "failed to get lock"
@@ -11256,7 +11250,7 @@ msgstr "поиск завершился неудачей"
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr ""
-#: sys-utils/fstrim.c:203 sys-utils/swapon.c:689 sys-utils/umount.c:330
+#: sys-utils/fstrim.c:203 sys-utils/swapon.c:728 sys-utils/umount.c:329
#, fuzzy, c-format
msgid "failed to parse %s"
msgstr "%s: невозможно открыть : %s\n"
@@ -12250,37 +12244,42 @@ msgstr ""
msgid "when using an ID, a single resource must be specified"
msgstr ""
-#: sys-utils/ipcs.c:202
+#: sys-utils/ipcs.c:203
+#, fuzzy, c-format
+msgid "unable to fetch shared memory limits\n"
+msgstr "максимум суммарной совм. исп. памяти (кбайт) = %lu\n"
+
+#: sys-utils/ipcs.c:206
#, c-format
msgid "------ Shared Memory Limits --------\n"
msgstr "------ Пределы совм. исп. памяти --------\n"
-#: sys-utils/ipcs.c:205
+#: sys-utils/ipcs.c:207
#, fuzzy, c-format
msgid "max number of segments = %ju\n"
msgstr "максимальное количество сегментов = %lu\n"
-#: sys-utils/ipcs.c:207
+#: sys-utils/ipcs.c:209
#, fuzzy
msgid "max seg size"
msgstr "неверный размер inode"
-#: sys-utils/ipcs.c:209
+#: sys-utils/ipcs.c:211
#, fuzzy
msgid "max total shared memory"
msgstr "максимум суммарной совм. исп. памяти (кбайт) = %lu\n"
-#: sys-utils/ipcs.c:212
+#: sys-utils/ipcs.c:214
#, fuzzy
msgid "min seg size"
msgstr "минимальный размер сегмента (байт) = %lu\n"
-#: sys-utils/ipcs.c:224
+#: sys-utils/ipcs.c:226
#, c-format
msgid "kernel not configured for shared memory\n"
msgstr "ядро не настроено для использования совместно используемой памяти\n"
-#: sys-utils/ipcs.c:228
+#: sys-utils/ipcs.c:230
#, c-format
msgid "------ Shared Memory Status --------\n"
msgstr "------ Состояние совм. исп. памяти --------\n"
@@ -12295,7 +12294,7 @@ msgstr "------ Состояние совм. исп. памяти --------\n"
#. "pages swapped = %ld\n"
#. "swap performance = %ld attempts, %ld successes\n"
#.
-#: sys-utils/ipcs.c:240
+#: sys-utils/ipcs.c:242
#, c-format
msgid ""
"segments allocated %d\n"
@@ -12305,303 +12304,313 @@ msgid ""
"Swap performance: %ld attempts\t %ld successes\n"
msgstr ""
-#: sys-utils/ipcs.c:257
+#: sys-utils/ipcs.c:259
#, c-format
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------ Создатели/владельцы сегмента совм. исп. памяти --------\n"
-#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:265 sys-utils/ipcs.c:272
-#: sys-utils/ipcs.c:278
+#: sys-utils/ipcs.c:261 sys-utils/ipcs.c:267 sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:280
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:278 sys-utils/ipcs.c:382
-#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:483 sys-utils/ipcs.c:501
+#: sys-utils/ipcs.c:261 sys-utils/ipcs.c:280 sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:401 sys-utils/ipcs.c:489 sys-utils/ipcs.c:507
msgid "perms"
msgstr "права"
-#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:261 sys-utils/ipcs.c:386 sys-utils/ipcs.c:489
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:261 sys-utils/ipcs.c:386 sys-utils/ipcs.c:489
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:261 sys-utils/ipcs.c:386 sys-utils/ipcs.c:489
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:259 sys-utils/ipcs.c:382 sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:261 sys-utils/ipcs.c:386 sys-utils/ipcs.c:489
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:263
+#: sys-utils/ipcs.c:265
#, c-format
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------ Число подключений/отключений/изменения совм. исп. памяти --------\n"
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:272 sys-utils/ipcs.c:278
-#: sys-utils/ipcs.c:388 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
-#: sys-utils/ipcs.c:495 sys-utils/ipcs.c:501
+#: sys-utils/ipcs.c:267 sys-utils/ipcs.c:274 sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:392 sys-utils/ipcs.c:401 sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:501 sys-utils/ipcs.c:507
msgid "owner"
msgstr "владелец"
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:267
msgid "attached"
msgstr "подключено"
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:267
msgid "detached"
msgstr "отключено"
-#: sys-utils/ipcs.c:266
+#: sys-utils/ipcs.c:268
msgid "changed"
msgstr "изменено"
-#: sys-utils/ipcs.c:270
+#: sys-utils/ipcs.c:272
#, fuzzy, c-format
msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
msgstr "------ Создатель/последняя операция совм. исп. памяти --------\n"
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:274
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:274
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:278
#, c-format
msgid "------ Shared Memory Segments --------\n"
msgstr "------ Сегменты совм. исп. памяти --------\n"
-#: sys-utils/ipcs.c:278 sys-utils/ipcs.c:397 sys-utils/ipcs.c:501
+#: sys-utils/ipcs.c:280 sys-utils/ipcs.c:401 sys-utils/ipcs.c:507
msgid "key"
msgstr "ключ"
-#: sys-utils/ipcs.c:279 sys-utils/ipcs.c:502
+#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:508
msgid "size"
msgstr "размер"
-#: sys-utils/ipcs.c:279 sys-utils/prlimit.c:75 sys-utils/prlimit.c:76
+#: sys-utils/ipcs.c:281 sys-utils/prlimit.c:75 sys-utils/prlimit.c:76
#: sys-utils/prlimit.c:78 sys-utils/prlimit.c:79 sys-utils/prlimit.c:81
#: sys-utils/prlimit.c:82 sys-utils/prlimit.c:86 sys-utils/prlimit.c:90
msgid "bytes"
msgstr "байты"
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:282
msgid "nattch"
msgstr "nattch"
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:282
msgid "status"
msgstr "состояние"
-#: sys-utils/ipcs.c:304 sys-utils/ipcs.c:306 sys-utils/ipcs.c:308
-#: sys-utils/ipcs.c:420 sys-utils/ipcs.c:422 sys-utils/ipcs.c:526
-#: sys-utils/ipcs.c:528 sys-utils/ipcs.c:530 sys-utils/ipcs.c:584
-#: sys-utils/ipcs.c:586 sys-utils/ipcs.c:615 sys-utils/ipcs.c:617
-#: sys-utils/ipcs.c:619 sys-utils/ipcs.c:643
+#: sys-utils/ipcs.c:306 sys-utils/ipcs.c:308 sys-utils/ipcs.c:310
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:426 sys-utils/ipcs.c:532
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:536 sys-utils/ipcs.c:590
+#: sys-utils/ipcs.c:592 sys-utils/ipcs.c:621 sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:625 sys-utils/ipcs.c:649
msgid "Not set"
msgstr "Не установлен"
-#: sys-utils/ipcs.c:334 sys-utils/lsipc.c:992 sys-utils/lsipc.c:998
+#: sys-utils/ipcs.c:336 sys-utils/lsipc.c:992 sys-utils/lsipc.c:998
msgid "dest"
msgstr "назначение"
-#: sys-utils/ipcs.c:335 sys-utils/lsipc.c:993 sys-utils/lsipc.c:1006
+#: sys-utils/ipcs.c:337 sys-utils/lsipc.c:993 sys-utils/lsipc.c:1006
msgid "locked"
msgstr "заблокирован"
-#: sys-utils/ipcs.c:354
+#: sys-utils/ipcs.c:357
+#, fuzzy, c-format
+msgid "unable to fetch semaphore limits\n"
+msgstr "Ошибка записи раздела на %s\n"
+
+#: sys-utils/ipcs.c:360
#, c-format
msgid "------ Semaphore Limits --------\n"
msgstr "------ Пределы семафоров --------\n"
-#: sys-utils/ipcs.c:357
+#: sys-utils/ipcs.c:361
#, c-format
msgid "max number of arrays = %d\n"
msgstr "максимальное количество массивов = %d\n"
-#: sys-utils/ipcs.c:358
+#: sys-utils/ipcs.c:362
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "максимум семафоров на массив = %d\n"
-#: sys-utils/ipcs.c:359
+#: sys-utils/ipcs.c:363
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "максимум семафоров на всю систему = %d\n"
-#: sys-utils/ipcs.c:360
+#: sys-utils/ipcs.c:364
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "максимум операций на вызов семафора = %d\n"
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:365
#, c-format
msgid "semaphore max value = %u\n"
msgstr "максимальное значение семафора = %u\n"
-#: sys-utils/ipcs.c:370
+#: sys-utils/ipcs.c:374
#, c-format
msgid "kernel not configured for semaphores\n"
msgstr "ядро не настроено на использование семафоров\n"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:377
#, c-format
msgid "------ Semaphore Status --------\n"
msgstr "------ Состояние семафора --------\n"
-#: sys-utils/ipcs.c:374
+#: sys-utils/ipcs.c:378
#, c-format
msgid "used arrays = %d\n"
msgstr "использовано массивов = %d\n"
-#: sys-utils/ipcs.c:375
+#: sys-utils/ipcs.c:379
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "выделено семафоров = %d\n"
-#: sys-utils/ipcs.c:380
+#: sys-utils/ipcs.c:384
#, c-format
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------ Создатели/владельцы массивов семафоров --------\n"
-#: sys-utils/ipcs.c:382 sys-utils/ipcs.c:388 sys-utils/ipcs.c:397
+#: sys-utils/ipcs.c:386 sys-utils/ipcs.c:392 sys-utils/ipcs.c:401
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:390
#, fuzzy, c-format
msgid "------ Semaphore Operation/Change Times --------\n"
msgstr "------ Количество операций/изменений совм. исп. памяти --------\n"
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:392
msgid "last-op"
msgstr "последняя операция"
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:392
msgid "last-changed"
msgstr "последнее изменение"
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:399
#, c-format
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Массивы семафоров --------\n"
-#: sys-utils/ipcs.c:397
+#: sys-utils/ipcs.c:401
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:456
+#: sys-utils/ipcs.c:459
+#, fuzzy, c-format
+msgid "unable to fetch message limits\n"
+msgstr "Количество головок"
+
+#: sys-utils/ipcs.c:462
#, fuzzy, c-format
msgid "------ Messages Limits --------\n"
msgstr "------ Сообщения: Пределы --------\n"
-#: sys-utils/ipcs.c:457
+#: sys-utils/ipcs.c:463
#, c-format
msgid "max queues system wide = %d\n"
msgstr "максимум очередей для всей системы = %d\n"
-#: sys-utils/ipcs.c:459
+#: sys-utils/ipcs.c:465
msgid "max size of message"
msgstr "максимальный размер сообщения"
-#: sys-utils/ipcs.c:461
+#: sys-utils/ipcs.c:467
msgid "default max size of queue"
msgstr "максимальный по умолчанию размер сообщения"
-#: sys-utils/ipcs.c:468
+#: sys-utils/ipcs.c:474
#, c-format
msgid "kernel not configured for message queues\n"
msgstr "ядро не настроено на использование очереди сообщений\n"
-#: sys-utils/ipcs.c:471
+#: sys-utils/ipcs.c:477
#, fuzzy, c-format
msgid "------ Messages Status --------\n"
msgstr "------ Сообщения: Состояние--------\n"
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:479
#, c-format
msgid "allocated queues = %d\n"
msgstr "выделено очередей = %d\n"
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:480
#, c-format
msgid "used headers = %d\n"
msgstr "использовано заголовков = %d\n"
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:482
msgid "used space"
msgstr "использовано пространства"
-#: sys-utils/ipcs.c:477
+#: sys-utils/ipcs.c:483
msgid " bytes\n"
msgstr " байт\n"
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:487
#, fuzzy, c-format
msgid "------ Message Queues Creators/Owners --------\n"
msgstr "------ Очереди сообщений: Создатели/владельцы--------\n"
-#: sys-utils/ipcs.c:483 sys-utils/ipcs.c:489 sys-utils/ipcs.c:495
-#: sys-utils/ipcs.c:501
+#: sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 sys-utils/ipcs.c:501
+#: sys-utils/ipcs.c:507
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:493
#, c-format
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "------ Количество отправлений/приема/изменений очереди сообщений --------\n"
-#: sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:495
msgid "send"
msgstr "отправлено"
-#: sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:495
msgid "recv"
msgstr "принято"
-#: sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:495
msgid "change"
msgstr "изменено"
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:499
#, c-format
msgid "------ Message Queues PIDs --------\n"
msgstr "------ PID'ы очереди сообщений --------\n"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:501
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:501
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:505
#, c-format
msgid "------ Message Queues --------\n"
msgstr "------ Очереди сообщений --------\n"
-#: sys-utils/ipcs.c:502
+#: sys-utils/ipcs.c:508
msgid "used-bytes"
msgstr "исп. байты"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:509
msgid "messages"
msgstr "сообщения"
-#: sys-utils/ipcs.c:568 sys-utils/ipcs.c:598 sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:574 sys-utils/ipcs.c:604 sys-utils/ipcs.c:637
#: sys-utils/lsipc.c:552 sys-utils/lsipc.c:738 sys-utils/lsipc.c:895
#, fuzzy, c-format
msgid "id %d not found"
msgstr "umount: %s: не найден"
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:578
#, c-format
msgid ""
"\n"
@@ -12610,45 +12619,45 @@ msgstr ""
"\n"
"Сегмент совм. исп. памяти shmid=%d\n"
-#: sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:579
#, fuzzy, c-format
msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:576
+#: sys-utils/ipcs.c:582
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "режим=%#o\tправа_доступа=%#o\n"
-#: sys-utils/ipcs.c:578
+#: sys-utils/ipcs.c:584
msgid "size="
msgstr "размер="
-#: sys-utils/ipcs.c:578
+#: sys-utils/ipcs.c:584
msgid "bytes="
msgstr "байты"
-#: sys-utils/ipcs.c:580
+#: sys-utils/ipcs.c:586
#, fuzzy, c-format
msgid "lpid=%u\tcpid=%u\tnattch=%jd\n"
msgstr "байты=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-#: sys-utils/ipcs.c:583
+#: sys-utils/ipcs.c:589
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "время_подкл=%-26.24s\n"
-#: sys-utils/ipcs.c:585
+#: sys-utils/ipcs.c:591
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "время_откл=%-26.24s\n"
-#: sys-utils/ipcs.c:587 sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:593 sys-utils/ipcs.c:624
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "время_измен=%-26.24s\n"
-#: sys-utils/ipcs.c:602
+#: sys-utils/ipcs.c:608
#, c-format
msgid ""
"\n"
@@ -12657,40 +12666,40 @@ msgstr ""
"\n"
"Очередь сообщений msqid=%d\n"
-#: sys-utils/ipcs.c:603
+#: sys-utils/ipcs.c:609
#, c-format
msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
msgstr "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tрежим=%#o\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:613
msgid "csize="
msgstr ""
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:613
#, fuzzy
msgid "cbytes="
msgstr "байты"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:615
msgid "qsize="
msgstr ""
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:615
#, fuzzy
msgid "qbytes="
msgstr "байты"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:620
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "время_отправки=%-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:622
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "время_получения=%-26.24s\n"
-#: sys-utils/ipcs.c:635
+#: sys-utils/ipcs.c:641
#, c-format
msgid ""
"\n"
@@ -12699,63 +12708,63 @@ msgstr ""
"\n"
"Массив семафоров semid=%d\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:642
#, c-format
msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
msgstr "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
-#: sys-utils/ipcs.c:639
+#: sys-utils/ipcs.c:645
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "режим=%#o, права_доступа=%#o\n"
-#: sys-utils/ipcs.c:641
+#: sys-utils/ipcs.c:647
#, fuzzy, c-format
msgid "nsems = %ju\n"
msgstr "к-во_сем = %ld\n"
-#: sys-utils/ipcs.c:642
+#: sys-utils/ipcs.c:648
#, c-format
msgid "otime = %-26.24s\n"
msgstr "время_опер = %-26.24s\n"
-#: sys-utils/ipcs.c:644
+#: sys-utils/ipcs.c:650
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "время_изм= %-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:653
msgid "semnum"
msgstr "число семафоров"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:653
msgid "value"
msgstr "значение"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:653
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:653
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:653
msgid "pid"
msgstr "pid"
-#: sys-utils/ipcutils.c:226 sys-utils/ipcutils.c:230 sys-utils/ipcutils.c:234
-#: sys-utils/ipcutils.c:238
+#: sys-utils/ipcutils.c:230 sys-utils/ipcutils.c:234 sys-utils/ipcutils.c:238
+#: sys-utils/ipcutils.c:242
#, fuzzy, c-format
msgid "%s failed"
msgstr "поиск завершился неудачей"
-#: sys-utils/ipcutils.c:499
+#: sys-utils/ipcutils.c:503
#, fuzzy, c-format
msgid "%s (bytes) = "
msgstr "байты"
-#: sys-utils/ipcutils.c:501
+#: sys-utils/ipcutils.c:505
#, fuzzy, c-format
msgid "%s (kbytes) = "
msgstr "байты"
@@ -12949,8 +12958,8 @@ msgstr ", шифрование %s (тип %d)"
msgid "%s: detach failed"
msgstr "%s состояние - %d"
-#: sys-utils/losetup.c:329 sys-utils/lscpu.c:1508 sys-utils/prlimit.c:229
-#: sys-utils/swapon.c:165 sys-utils/wdctl.c:215 sys-utils/zramctl.c:348
+#: sys-utils/losetup.c:329 sys-utils/lscpu.c:1541 sys-utils/prlimit.c:229
+#: sys-utils/swapon.c:176 sys-utils/wdctl.c:215 sys-utils/zramctl.c:348
#, fuzzy
msgid "failed to initialize output line"
msgstr "Невозможно выделить буфер.\n"
@@ -13109,112 +13118,117 @@ msgstr "%s состояние - %d"
msgid "%s: set direct io failed"
msgstr "%s: не удалось перейти в каталог"
-#: sys-utils/lscpu.c:97
+#: sys-utils/lscpu.c:107
msgid "none"
msgstr "нет"
-#: sys-utils/lscpu.c:98
+#: sys-utils/lscpu.c:108
msgid "para"
msgstr ""
-#: sys-utils/lscpu.c:99
+#: sys-utils/lscpu.c:109
msgid "full"
msgstr "полный"
-#: sys-utils/lscpu.c:100
+#: sys-utils/lscpu.c:110
msgid "container"
msgstr "контейнер"
-#: sys-utils/lscpu.c:161
+#: sys-utils/lscpu.c:171
msgid "horizontal"
msgstr "горизонтальный"
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:172
msgid "vertical"
msgstr "вертикальный"
-#: sys-utils/lscpu.c:314
+#: sys-utils/lscpu.c:326
msgid "logical CPU number"
msgstr "номер логического ЦПУ"
-#: sys-utils/lscpu.c:315
+#: sys-utils/lscpu.c:327
msgid "logical core number"
msgstr "номер логического ядра"
-#: sys-utils/lscpu.c:316
+#: sys-utils/lscpu.c:328
msgid "logical socket number"
msgstr ""
-#: sys-utils/lscpu.c:317
+#: sys-utils/lscpu.c:329
msgid "logical NUMA node number"
msgstr ""
-#: sys-utils/lscpu.c:318
+#: sys-utils/lscpu.c:330
msgid "logical book number"
msgstr ""
-#: sys-utils/lscpu.c:319
+#: sys-utils/lscpu.c:331
msgid "shows how caches are shared between CPUs"
msgstr ""
-#: sys-utils/lscpu.c:320
+#: sys-utils/lscpu.c:332
msgid "CPU dispatching mode on virtual hardware"
msgstr ""
-#: sys-utils/lscpu.c:321
+#: sys-utils/lscpu.c:333
msgid "physical address of a CPU"
msgstr "физический адрес ЦПУ"
-#: sys-utils/lscpu.c:322
+#: sys-utils/lscpu.c:334
msgid "shows if the hypervisor has allocated the CPU"
msgstr ""
-#: sys-utils/lscpu.c:323
+#: sys-utils/lscpu.c:335
msgid "shows if Linux currently makes use of the CPU"
msgstr ""
-#: sys-utils/lscpu.c:324
+#: sys-utils/lscpu.c:336
msgid "shows the maximum MHz of the CPU"
msgstr "показать максимальную частоту ЦПУ в MHz "
-#: sys-utils/lscpu.c:325
+#: sys-utils/lscpu.c:337
msgid "shows the minimum MHz of the CPU"
msgstr "показать минимальную частоту ЦПУ в MHz "
-#: sys-utils/lscpu.c:459
+#: sys-utils/lscpu.c:472
#, fuzzy
msgid "error: uname failed"
msgstr "mount завершился неудачей"
-#: sys-utils/lscpu.c:534
+#: sys-utils/lscpu.c:549
#, fuzzy, c-format
msgid "failed to determine number of CPUs: %s"
msgstr "%s: предупреждение - невозможно определить размер файловой системы\n"
-#: sys-utils/lscpu.c:776
+#: sys-utils/lscpu.c:791
#, fuzzy
msgid "error: can not set signal handler"
msgstr "Невозможно установить обработчик сигнала"
-#: sys-utils/lscpu.c:781
+#: sys-utils/lscpu.c:796
#, fuzzy
msgid "error: can not restore signal handler"
msgstr "Невозможно установить обработчик сигнала"
-#: sys-utils/lscpu.c:1216
+#: sys-utils/lscpu.c:841
+#, fuzzy, c-format
+msgid "failed to read from: %s"
+msgstr "не удалось прочитать символьную ссылку: %s"
+
+#: sys-utils/lscpu.c:1249
#, fuzzy
msgid "Failed to extract the node number"
msgstr "Невозможно выделить буфер.\n"
-#: sys-utils/lscpu.c:1310 sys-utils/lscpu.c:1320
+#: sys-utils/lscpu.c:1343 sys-utils/lscpu.c:1353
msgid "Y"
msgstr "Д"
-#: sys-utils/lscpu.c:1310 sys-utils/lscpu.c:1320
+#: sys-utils/lscpu.c:1343 sys-utils/lscpu.c:1353
msgid "N"
msgstr "Н"
-#: sys-utils/lscpu.c:1404
+#: sys-utils/lscpu.c:1437
#, c-format
msgid ""
"# The following is the parsable format, which can be fed to other\n"
@@ -13222,180 +13236,180 @@ msgid ""
"# starting from zero.\n"
msgstr ""
-#: sys-utils/lscpu.c:1554
+#: sys-utils/lscpu.c:1587
msgid "Architecture:"
msgstr "Архитектура:"
-#: sys-utils/lscpu.c:1568
+#: sys-utils/lscpu.c:1601
msgid "CPU op-mode(s):"
msgstr ""
-#: sys-utils/lscpu.c:1571 sys-utils/lscpu.c:1573
+#: sys-utils/lscpu.c:1604 sys-utils/lscpu.c:1606
msgid "Byte Order:"
msgstr "Порядок байт:"
-#: sys-utils/lscpu.c:1575
+#: sys-utils/lscpu.c:1608
msgid "CPU(s):"
msgstr ""
-#: sys-utils/lscpu.c:1578
+#: sys-utils/lscpu.c:1611
msgid "On-line CPU(s) mask:"
msgstr ""
-#: sys-utils/lscpu.c:1579
+#: sys-utils/lscpu.c:1612
msgid "On-line CPU(s) list:"
msgstr ""
-#: sys-utils/lscpu.c:1598
+#: sys-utils/lscpu.c:1631
msgid "Off-line CPU(s) mask:"
msgstr ""
-#: sys-utils/lscpu.c:1599
+#: sys-utils/lscpu.c:1632
msgid "Off-line CPU(s) list:"
msgstr ""
-#: sys-utils/lscpu.c:1630
+#: sys-utils/lscpu.c:1663
msgid "Thread(s) per core:"
msgstr ""
-#: sys-utils/lscpu.c:1631
+#: sys-utils/lscpu.c:1664
msgid "Core(s) per socket:"
msgstr "Ядер на сокет:"
-#: sys-utils/lscpu.c:1634
+#: sys-utils/lscpu.c:1667
msgid "Socket(s) per book:"
msgstr ""
-#: sys-utils/lscpu.c:1636
+#: sys-utils/lscpu.c:1669
msgid "Book(s):"
msgstr ""
-#: sys-utils/lscpu.c:1638
+#: sys-utils/lscpu.c:1671
msgid "Socket(s):"
msgstr "Сокетов:"
-#: sys-utils/lscpu.c:1642
+#: sys-utils/lscpu.c:1675
msgid "NUMA node(s):"
msgstr ""
-#: sys-utils/lscpu.c:1644
+#: sys-utils/lscpu.c:1677
msgid "Vendor ID:"
msgstr "ID прроизводителя:"
-#: sys-utils/lscpu.c:1646
+#: sys-utils/lscpu.c:1679
msgid "CPU family:"
msgstr "Семейство ЦПУ:"
-#: sys-utils/lscpu.c:1648
+#: sys-utils/lscpu.c:1681
msgid "Model:"
msgstr "Модель:"
-#: sys-utils/lscpu.c:1650
+#: sys-utils/lscpu.c:1683
msgid "Model name:"
msgstr "Имя модели:"
-#: sys-utils/lscpu.c:1652
+#: sys-utils/lscpu.c:1685
msgid "Stepping:"
msgstr "Степпинг:"
-#: sys-utils/lscpu.c:1654
+#: sys-utils/lscpu.c:1687
msgid "CPU MHz:"
msgstr ""
-#: sys-utils/lscpu.c:1656
+#: sys-utils/lscpu.c:1689
msgid "CPU max MHz:"
msgstr ""
-#: sys-utils/lscpu.c:1658
+#: sys-utils/lscpu.c:1691
msgid "CPU min MHz:"
msgstr ""
-#: sys-utils/lscpu.c:1660
+#: sys-utils/lscpu.c:1693
msgid "BogoMIPS:"
msgstr ""
-#: sys-utils/lscpu.c:1663 sys-utils/lscpu.c:1665
+#: sys-utils/lscpu.c:1696 sys-utils/lscpu.c:1698
msgid "Virtualization:"
msgstr "Виртуализация:"
-#: sys-utils/lscpu.c:1668
+#: sys-utils/lscpu.c:1701
msgid "Hypervisor:"
msgstr "Гипервизор:"
-#: sys-utils/lscpu.c:1670
+#: sys-utils/lscpu.c:1703
msgid "Hypervisor vendor:"
msgstr "Разработчик гипервизора:"
-#: sys-utils/lscpu.c:1671
+#: sys-utils/lscpu.c:1704
msgid "Virtualization type:"
msgstr "Тип виртуализации:"
-#: sys-utils/lscpu.c:1674
+#: sys-utils/lscpu.c:1707
msgid "Dispatching mode:"
msgstr ""
-#: sys-utils/lscpu.c:1680
+#: sys-utils/lscpu.c:1713
#, c-format
msgid "%s cache:"
msgstr ""
-#: sys-utils/lscpu.c:1686
+#: sys-utils/lscpu.c:1719
#, c-format
msgid "NUMA node%d CPU(s):"
msgstr ""
-#: sys-utils/lscpu.c:1691
+#: sys-utils/lscpu.c:1724
msgid "Flags:"
msgstr "Флаги:"
-#: sys-utils/lscpu.c:1694
+#: sys-utils/lscpu.c:1727
#, fuzzy
msgid "Physical sockets:"
msgstr "Физические цилиндры"
-#: sys-utils/lscpu.c:1695
+#: sys-utils/lscpu.c:1728
#, fuzzy
msgid "Physical chips:"
msgstr "Физические цилиндры"
-#: sys-utils/lscpu.c:1696
+#: sys-utils/lscpu.c:1729
#, fuzzy
msgid "Physical cores/chip:"
msgstr "размер физического сектора"
-#: sys-utils/lscpu.c:1708
+#: sys-utils/lscpu.c:1741
msgid "Display information about the CPU architecture.\n"
msgstr ""
-#: sys-utils/lscpu.c:1711
+#: sys-utils/lscpu.c:1744
msgid " -a, --all print both online and offline CPUs (default for -e)\n"
msgstr ""
-#: sys-utils/lscpu.c:1712
+#: sys-utils/lscpu.c:1745
msgid " -b, --online print online CPUs only (default for -p)\n"
msgstr ""
-#: sys-utils/lscpu.c:1713
+#: sys-utils/lscpu.c:1746
msgid " -c, --offline print offline CPUs only\n"
msgstr ""
-#: sys-utils/lscpu.c:1714
+#: sys-utils/lscpu.c:1747
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr ""
-#: sys-utils/lscpu.c:1715
+#: sys-utils/lscpu.c:1748
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr ""
-#: sys-utils/lscpu.c:1716
+#: sys-utils/lscpu.c:1749
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr ""
-#: sys-utils/lscpu.c:1717
+#: sys-utils/lscpu.c:1750
msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n"
msgstr ""
-#: sys-utils/lscpu.c:1814
+#: sys-utils/lscpu.c:1847
#, c-format
msgid "%s: options --all, --online and --offline may only be used with options --extended or --parse.\n"
msgstr ""
@@ -13795,40 +13809,40 @@ msgstr ""
msgid "noreserve"
msgstr "SunOS usr"
-#: sys-utils/lsipc.c:1076
+#: sys-utils/lsipc.c:1077
#, fuzzy
msgid "Shared memory segments"
msgstr ""
"\n"
"Сегмент совм. исп. памяти shmid=%d\n"
-#: sys-utils/lsipc.c:1077
+#: sys-utils/lsipc.c:1078
#, fuzzy
msgid "Shared memory pages"
msgstr ""
"\n"
"Сегмент совм. исп. памяти shmid=%d\n"
-#: sys-utils/lsipc.c:1078
+#: sys-utils/lsipc.c:1079
#, fuzzy
msgid "Max size of shared memory segment (bytes)"
msgstr ""
"\n"
"Сегмент совм. исп. памяти shmid=%d\n"
-#: sys-utils/lsipc.c:1079
+#: sys-utils/lsipc.c:1080
#, fuzzy
msgid "Min size of shared memory segment (bytes)"
msgstr ""
"\n"
"Сегмент совм. исп. памяти shmid=%d\n"
-#: sys-utils/lsipc.c:1152
+#: sys-utils/lsipc.c:1151
#, fuzzy
msgid "failed to parse IPC identifier"
msgstr "не удалось определить идентификатор процесса"
-#: sys-utils/lsipc.c:1246
+#: sys-utils/lsipc.c:1245
msgid "--global is mutually exclusive with --creator, --id and --time"
msgstr ""
@@ -13870,105 +13884,105 @@ msgstr ""
msgid "username of the PID"
msgstr ""
-#: sys-utils/lsns.c:588
+#: sys-utils/lsns.c:589
#, fuzzy, c-format
msgid " %s [options] [<namespace>]\n"
msgstr "использование: %s программа [аргумент ...]\n"
-#: sys-utils/lsns.c:591
+#: sys-utils/lsns.c:592
#, fuzzy
msgid "List system namespaces.\n"
msgstr "Невозможно установить системные часы.\n"
-#: sys-utils/lsns.c:598
+#: sys-utils/lsns.c:599
#, fuzzy
msgid " -p, --task <pid> print process namespaces\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/lsns.c:601
+#: sys-utils/lsns.c:602
msgid " -t, --type <name> namespace type (mnt, net, ipc, user, pid, uts)\n"
msgstr ""
-#: sys-utils/lsns.c:691
+#: sys-utils/lsns.c:692
#, fuzzy, c-format
msgid "unknown namespace type: %s"
msgstr "mount: неизвестный тип файловой системы '%s'"
-#: sys-utils/lsns.c:710
+#: sys-utils/lsns.c:711
msgid "--task is mutually exclusive with <namespace>"
msgstr ""
-#: sys-utils/lsns.c:711
+#: sys-utils/lsns.c:712
#, fuzzy
msgid "invalid namespace argument"
msgstr "недопустимый аргумент головок"
-#: sys-utils/lsns.c:749
+#: sys-utils/lsns.c:750
#, c-format
msgid "not found namespace: %ju"
msgstr ""
-#: sys-utils/mount.c:66 sys-utils/umount.c:118
+#: sys-utils/mount.c:66 sys-utils/umount.c:117
#, fuzzy, c-format
msgid "only root can use \"--%s\" option (effective UID is %u)"
msgstr "mount: только root может сделать это"
-#: sys-utils/mount.c:69 sys-utils/umount.c:121
+#: sys-utils/mount.c:69 sys-utils/umount.c:120
#, fuzzy, c-format
msgid "only root can do that (effective UID is %u)"
msgstr "mount: только root может сделать это"
-#: sys-utils/mount.c:73 sys-utils/umount.c:125
+#: sys-utils/mount.c:73 sys-utils/umount.c:124
#, fuzzy, c-format
msgid "only root can use \"--%s\" option"
msgstr "mount: только root может монтировать %s на %s"
-#: sys-utils/mount.c:74 sys-utils/umount.c:126
+#: sys-utils/mount.c:74 sys-utils/umount.c:125
#, fuzzy
msgid "only root can do that"
msgstr "mount: только root может сделать это"
-#: sys-utils/mount.c:85 sys-utils/umount.c:60
+#: sys-utils/mount.c:85 sys-utils/umount.c:59
#, fuzzy, c-format
msgid "%s from %s (libmount %s"
msgstr "%s из %s%s\n"
-#: sys-utils/mount.c:131
+#: sys-utils/mount.c:130
#, fuzzy
msgid "failed to read mtab"
msgstr "Невозможно прочитать %s\n"
-#: sys-utils/mount.c:193 sys-utils/umount.c:285
+#: sys-utils/mount.c:192 sys-utils/umount.c:284
#, c-format
msgid "%-25s: ignored\n"
msgstr ""
-#: sys-utils/mount.c:194
+#: sys-utils/mount.c:193
#, fuzzy, c-format
msgid "%-25s: already mounted\n"
msgstr "mount: %s уже примонтирован на %s\n"
-#: sys-utils/mount.c:250
+#: sys-utils/mount.c:249
#, fuzzy, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s: \"%s\" не существует.\n"
-#: sys-utils/mount.c:252
+#: sys-utils/mount.c:251
#, fuzzy, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s: ошибка поиска на %s\n"
-#: sys-utils/mount.c:255 sys-utils/mount.c:259
+#: sys-utils/mount.c:254 sys-utils/mount.c:258
#, fuzzy, c-format
msgid "%s: %s mounted on %s.\n"
msgstr "mount: %s уже примонтирован на %s\n"
-#: sys-utils/mount.c:257
+#: sys-utils/mount.c:256
#, fuzzy, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s: %s не изменен\n"
-#: sys-utils/mount.c:311
+#: sys-utils/mount.c:310
#, c-format
msgid ""
"mount: %s does not contain SELinux labels.\n"
@@ -13978,36 +13992,36 @@ msgid ""
" this file system. For more details see restorecon(8) and mount(8).\n"
msgstr ""
-#: sys-utils/mount.c:379
+#: sys-utils/mount.c:378
msgid "WARNING: failed to apply propagation flags"
msgstr ""
-#: sys-utils/mount.c:401
+#: sys-utils/mount.c:400
#, fuzzy, c-format
msgid "only root can mount %s on %s"
msgstr "mount: только root может монтировать %s на %s"
-#: sys-utils/mount.c:404
+#: sys-utils/mount.c:403
#, fuzzy, c-format
msgid "%s is already mounted"
msgstr "mount: proc уже примонтирован"
-#: sys-utils/mount.c:408
+#: sys-utils/mount.c:407
#, fuzzy, c-format
msgid "can't find %s in %s"
msgstr "mount: невозможно найти %s в %s"
-#: sys-utils/mount.c:415
+#: sys-utils/mount.c:414
#, fuzzy, c-format
msgid "can't find mountpoint %s in %s"
msgstr "mount: невозможно найти %s в %s или %s"
-#: sys-utils/mount.c:418
+#: sys-utils/mount.c:417
#, fuzzy, c-format
msgid "can't find mount source %s in %s"
msgstr "shutdown: Невозможно размонтировать %s: %s\n"
-#: sys-utils/mount.c:422
+#: sys-utils/mount.c:421
#, c-format
msgid ""
"%s: more filesystems detected. This should not happen,\n"
@@ -14015,115 +14029,115 @@ msgid ""
" use wipefs(8) to clean up the device."
msgstr ""
-#: sys-utils/mount.c:428
+#: sys-utils/mount.c:427
#, fuzzy
msgid "I could not determine the filesystem type, and none was specified"
msgstr "mount: невозможно определить тип файловой системы, и ни одна не была указана"
-#: sys-utils/mount.c:431
+#: sys-utils/mount.c:430
#, fuzzy
msgid "you must specify the filesystem type"
msgstr "mount: вы должны указать тип файловой системы"
-#: sys-utils/mount.c:437
+#: sys-utils/mount.c:436
#, fuzzy, c-format
msgid "can't find %s"
msgstr "%s: невозможно прочитать %s.\n"
-#: sys-utils/mount.c:439
+#: sys-utils/mount.c:438
#, fuzzy
msgid "mount source not defined"
msgstr "mount: монтирование завершилось неудачей"
-#: sys-utils/mount.c:443 sys-utils/mount.c:445
+#: sys-utils/mount.c:442 sys-utils/mount.c:444
#, fuzzy
msgid "failed to parse mount options"
msgstr "%s: невозможно открыть : %s\n"
-#: sys-utils/mount.c:448
+#: sys-utils/mount.c:447
#, fuzzy, c-format
msgid "%s: failed to setup loop device"
msgstr "mount: установка устройства обратной связи завершилась неудачей\n"
-#: sys-utils/mount.c:451
+#: sys-utils/mount.c:450
#, fuzzy, c-format
msgid "%s: mount failed"
msgstr "mount завершился неудачей"
-#: sys-utils/mount.c:461
+#: sys-utils/mount.c:460
#, c-format
msgid "%s: filesystem mounted, but mount(8) failed"
msgstr ""
-#: sys-utils/mount.c:478 sys-utils/mount.c:530
+#: sys-utils/mount.c:477 sys-utils/mount.c:529
#, fuzzy, c-format
msgid "mount point %s is not a directory"
msgstr "mount: точка монтирования %s не является каталогом"
-#: sys-utils/mount.c:482
+#: sys-utils/mount.c:481
#, fuzzy
msgid "must be superuser to use mount"
msgstr "mount: необходимо иметь права суперпользователя для использования mount"
-#: sys-utils/mount.c:490
+#: sys-utils/mount.c:489
#, fuzzy, c-format
msgid "%s is busy"
msgstr "mount: %s занят"
-#: sys-utils/mount.c:494
+#: sys-utils/mount.c:493
#, fuzzy, c-format
msgid "%s is already mounted or %s busy"
msgstr "mount: %s уже примонтирован или %s занят"
-#: sys-utils/mount.c:506
+#: sys-utils/mount.c:505
#, fuzzy, c-format
msgid " %s is already mounted on %s\n"
msgstr "mount: %s уже примонтирован на %s\n"
-#: sys-utils/mount.c:514
+#: sys-utils/mount.c:513
#, fuzzy, c-format
msgid "mount point %s does not exist"
msgstr "mount: точка монтирования %s не существует"
-#: sys-utils/mount.c:516
+#: sys-utils/mount.c:515
#, fuzzy, c-format
msgid "mount point %s is a symbolic link to nowhere"
msgstr "mount: точка монтирования %s является символической ссылкой в никуда"
-#: sys-utils/mount.c:521
+#: sys-utils/mount.c:520
#, fuzzy, c-format
msgid "special device %s does not exist"
msgstr "mount: специальное устройство %s не существует"
-#: sys-utils/mount.c:524 sys-utils/mount.c:539
+#: sys-utils/mount.c:523 sys-utils/mount.c:538
#, fuzzy
msgid "mount(2) failed"
msgstr "mount завершился неудачей"
-#: sys-utils/mount.c:535
+#: sys-utils/mount.c:534
#, fuzzy, c-format
msgid "special device %s does not exist (a path prefix is not a directory)"
msgstr ""
"mount: специальное устройство %s не существует\n"
" (префикс пути не является каталогом)\n"
-#: sys-utils/mount.c:545
+#: sys-utils/mount.c:544
#, fuzzy, c-format
msgid "%s not mounted or bad option"
msgstr "mount: %s уже не примонтирован или неверная опция"
-#: sys-utils/mount.c:547
+#: sys-utils/mount.c:546
#, fuzzy, c-format
msgid "%s is not mountpoint or bad option"
msgstr "mount: %s уже не примонтирован или неверная опция"
-#: sys-utils/mount.c:549
+#: sys-utils/mount.c:548
msgid ""
"bad option. Note that moving a mount residing under a shared\n"
" mount is unsupported."
msgstr ""
-#: sys-utils/mount.c:552
+#: sys-utils/mount.c:551
#, fuzzy, c-format
msgid ""
"wrong fs type, bad option, bad superblock on %s,\n"
@@ -14132,14 +14146,14 @@ msgstr ""
"mount: неверный тип ФС, неверная опция, неверный суперблок\n"
" на %s, отсутствует кодовая страница или другая ошибка"
-#: sys-utils/mount.c:558
+#: sys-utils/mount.c:557
#, c-format
msgid ""
" (for several filesystems (e.g. nfs, cifs) you might\n"
" need a /sbin/mount.<type> helper program)\n"
msgstr ""
-#: sys-utils/mount.c:561
+#: sys-utils/mount.c:560
#, fuzzy, c-format
msgid ""
"\n"
@@ -14150,31 +14164,31 @@ msgstr ""
" найдена в syslog - попробуйте dmesg | tail или что-то\n"
" в этом роде\n"
-#: sys-utils/mount.c:567
+#: sys-utils/mount.c:566
msgid "mount table full"
msgstr "таблица монтирования заполнена"
-#: sys-utils/mount.c:571
+#: sys-utils/mount.c:570
#, fuzzy, c-format
msgid "%s: can't read superblock"
msgstr "mount: %s: невозможно прочитать суперблок"
-#: sys-utils/mount.c:576
+#: sys-utils/mount.c:575
#, fuzzy, c-format
msgid "unknown filesystem type '%s'"
msgstr "mount: неизвестный тип файловой системы '%s'"
-#: sys-utils/mount.c:578
+#: sys-utils/mount.c:577
#, fuzzy
msgid "unknown filesystem type"
msgstr "mount: неизвестный тип файловой системы '%s'"
-#: sys-utils/mount.c:586
+#: sys-utils/mount.c:585
#, fuzzy, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "mount: %s не является блочным устройством, а определение состояния невозможно?"
-#: sys-utils/mount.c:588
+#: sys-utils/mount.c:587
#, fuzzy, c-format
msgid ""
"the kernel does not recognize %s as a block device\n"
@@ -14183,67 +14197,67 @@ msgstr ""
"mount: ядро не распознает %s как блочное устройство\n"
" (может быть `insmod driver'?)"
-#: sys-utils/mount.c:591
+#: sys-utils/mount.c:590
#, fuzzy, c-format
msgid "%s is not a block device (maybe try `-o loop'?)"
msgstr "mount: %s не является блочным устройством (может попробовать `-o loop'?)"
-#: sys-utils/mount.c:593
+#: sys-utils/mount.c:592
#, fuzzy, c-format
msgid " %s is not a block device"
msgstr "mount: %s не является блочным устройством"
-#: sys-utils/mount.c:600
+#: sys-utils/mount.c:599
#, fuzzy, c-format
msgid "%s is not a valid block device"
msgstr "mount: %s не является верным блочным устройством"
-#: sys-utils/mount.c:606
+#: sys-utils/mount.c:605
#, fuzzy, c-format
msgid "cannot mount %s read-only"
msgstr "mount: невозможно примонтировать %s%s только для чтения"
-#: sys-utils/mount.c:609
+#: sys-utils/mount.c:608
#, fuzzy, c-format
msgid "%s is write-protected but explicit `-w' flag given"
msgstr "mount: %s%s защищен от записи, но явно указан флаг `-w'"
-#: sys-utils/mount.c:612
+#: sys-utils/mount.c:611
#, fuzzy, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "mount: невозможно примонтировать %s%s только для чтения"
-#: sys-utils/mount.c:615 sys-utils/mount.c:638 sys-utils/unshare.c:187
+#: sys-utils/mount.c:614 sys-utils/mount.c:637 sys-utils/unshare.c:188
#, fuzzy, c-format
msgid "mount %s on %s failed"
msgstr "mount: монтирование завершилось неудачей"
-#: sys-utils/mount.c:618
+#: sys-utils/mount.c:617
#, fuzzy, c-format
msgid "%s is write-protected, mounting read-only"
msgstr "mount: %s%s защищен от записи, монтируется только для чтения"
-#: sys-utils/mount.c:634
+#: sys-utils/mount.c:633
#, fuzzy, c-format
msgid "no medium found on %s"
msgstr "mount: %s уже примонтирован на %s\n"
-#: sys-utils/mount.c:662
+#: sys-utils/mount.c:661
#, fuzzy, c-format
msgid "%s: failed to parse"
msgstr "%s: невозможно открыть : %s\n"
-#: sys-utils/mount.c:701
+#: sys-utils/mount.c:700
#, fuzzy, c-format
msgid "unsupported option format: %s"
msgstr "Введите тип файловой системы:"
-#: sys-utils/mount.c:703
+#: sys-utils/mount.c:702
#, fuzzy, c-format
msgid "failed to append option '%s'"
msgstr "%s: невозможно открыть : %s\n"
-#: sys-utils/mount.c:720
+#: sys-utils/mount.c:719
#, c-format
msgid ""
" %1$s [-lhV]\n"
@@ -14253,12 +14267,12 @@ msgid ""
" %1$s <operation> <mountpoint> [<target>]\n"
msgstr ""
-#: sys-utils/mount.c:728
+#: sys-utils/mount.c:727
#, fuzzy
msgid "Mount a filesystem.\n"
msgstr "Запускается проверка файловой системы на %s.\n"
-#: sys-utils/mount.c:732
+#: sys-utils/mount.c:731
#, c-format
msgid ""
" -a, --all mount all filesystems mentioned in fstab\n"
@@ -14268,22 +14282,22 @@ msgid ""
" -T, --fstab <path> alternative file to /etc/fstab\n"
msgstr ""
-#: sys-utils/mount.c:738
+#: sys-utils/mount.c:737
#, c-format
msgid " -i, --internal-only don't call the mount.<type> helpers\n"
msgstr ""
-#: sys-utils/mount.c:740
+#: sys-utils/mount.c:739
#, fuzzy, c-format
msgid " -l, --show-labels show also filesystem labels\n"
msgstr " l список типов известных файловых систем"
-#: sys-utils/mount.c:742 sys-utils/umount.c:93
+#: sys-utils/mount.c:741 sys-utils/umount.c:92
#, fuzzy, c-format
msgid " -n, --no-mtab don't write to /etc/mtab\n"
msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
-#: sys-utils/mount.c:744
+#: sys-utils/mount.c:743
#, c-format
msgid ""
" -o, --options <list> comma-separated list of mount options\n"
@@ -14292,24 +14306,24 @@ msgid ""
" -t, --types <list> limit the set of filesystem types\n"
msgstr ""
-#: sys-utils/mount.c:749
+#: sys-utils/mount.c:748
#, c-format
msgid ""
" --source <src> explicitly specifies source (path, label, uuid)\n"
" --target <target> explicitly specifies mountpoint\n"
msgstr ""
-#: sys-utils/mount.c:752 sys-utils/umount.c:99
+#: sys-utils/mount.c:751 sys-utils/umount.c:98
#, fuzzy, c-format
msgid " -v, --verbose say what is being done\n"
msgstr " -s, --shell=шелл Установка условий закл. в кавычки для шелла\n"
-#: sys-utils/mount.c:754
+#: sys-utils/mount.c:753
#, c-format
msgid " -w, --rw, --read-write mount the filesystem read-write (default)\n"
msgstr ""
-#: sys-utils/mount.c:761
+#: sys-utils/mount.c:760
#, c-format
msgid ""
"\n"
@@ -14322,7 +14336,7 @@ msgid ""
" PARTUUID=<uuid> specifies device by partition UUID\n"
msgstr ""
-#: sys-utils/mount.c:770
+#: sys-utils/mount.c:769
#, c-format
msgid ""
" <device> specifies device by path\n"
@@ -14330,7 +14344,7 @@ msgid ""
" <file> regular file for loopdev setup\n"
msgstr ""
-#: sys-utils/mount.c:775
+#: sys-utils/mount.c:774
#, c-format
msgid ""
"\n"
@@ -14340,7 +14354,7 @@ msgid ""
" -R, --rbind mount a subtree and all submounts somewhere else\n"
msgstr ""
-#: sys-utils/mount.c:780
+#: sys-utils/mount.c:779
#, c-format
msgid ""
" --make-shared mark a subtree as shared\n"
@@ -14349,7 +14363,7 @@ msgid ""
" --make-unbindable mark a subtree as unbindable\n"
msgstr ""
-#: sys-utils/mount.c:785
+#: sys-utils/mount.c:784
#, c-format
msgid ""
" --make-rshared recursively mark a whole subtree as shared\n"
@@ -14358,17 +14372,17 @@ msgid ""
" --make-runbindable recursively mark a whole subtree as unbindable\n"
msgstr ""
-#: sys-utils/mount.c:871 sys-utils/umount.c:549
+#: sys-utils/mount.c:870 sys-utils/umount.c:548
#, fuzzy
msgid "libmount context allocation failed"
msgstr "mount: монтирование завершилось неудачей"
-#: sys-utils/mount.c:928 sys-utils/umount.c:602
+#: sys-utils/mount.c:927 sys-utils/umount.c:601
#, fuzzy
msgid "failed to set options pattern"
msgstr "Ошибка записи раздела на %s\n"
-#: sys-utils/mount.c:1081
+#: sys-utils/mount.c:1080
#, fuzzy
msgid "source specified more than once"
msgstr "Вы указали цилиндров больше, чем может быть на диске"
@@ -14401,131 +14415,136 @@ msgstr "%s не является точкой монтирования\n"
msgid "%s is a mountpoint\n"
msgstr "%s является точкой монтирования\n"
-#: sys-utils/nsenter.c:69 sys-utils/setpriv.c:93 sys-utils/unshare.c:245
+#: sys-utils/nsenter.c:70 sys-utils/setpriv.c:93 sys-utils/unshare.c:246
#, fuzzy, c-format
msgid " %s [options] <program> [<argument>...]\n"
msgstr "использование: %s программа [аргумент ...]\n"
-#: sys-utils/nsenter.c:73
+#: sys-utils/nsenter.c:74
msgid "Run a program with namespaces of other processes.\n"
msgstr ""
-#: sys-utils/nsenter.c:76
+#: sys-utils/nsenter.c:77
msgid " -t, --target <pid> target process to get namespaces from\n"
msgstr ""
-#: sys-utils/nsenter.c:77
+#: sys-utils/nsenter.c:78
#, fuzzy
msgid " -m, --mount[=<file>] enter mount namespace\n"
msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
-#: sys-utils/nsenter.c:78
+#: sys-utils/nsenter.c:79
#, fuzzy
msgid " -u, --uts[=<file>] enter UTS namespace (hostname etc)\n"
msgstr " -q, --quiet Отключение отчета об ошибках getopt(3)\n"
-#: sys-utils/nsenter.c:79
+#: sys-utils/nsenter.c:80
msgid " -i, --ipc[=<file>] enter System V IPC namespace\n"
msgstr ""
-#: sys-utils/nsenter.c:80
+#: sys-utils/nsenter.c:81
#, fuzzy
msgid " -n, --net[=<file>] enter network namespace\n"
msgstr " -T, --test Проверка версии getopt(1)\n"
-#: sys-utils/nsenter.c:81
+#: sys-utils/nsenter.c:82
#, fuzzy
msgid " -p, --pid[=<file>] enter pid namespace\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/nsenter.c:82
+#: sys-utils/nsenter.c:83
+#, fuzzy
+msgid " -C, --cgroup[=<file>] enter cgroup namespace\n"
+msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
+
+#: sys-utils/nsenter.c:84
#, fuzzy
msgid " -U, --user[=<file>] enter user namespace\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/nsenter.c:83
+#: sys-utils/nsenter.c:85
#, fuzzy
msgid " -S, --setuid <uid> set uid in entered namespace\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/nsenter.c:84
+#: sys-utils/nsenter.c:86
#, fuzzy
msgid " -G, --setgid <gid> set gid in entered namespace\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/nsenter.c:85
+#: sys-utils/nsenter.c:87
msgid " --preserve-credentials do not touch uids or gids\n"
msgstr ""
-#: sys-utils/nsenter.c:86
+#: sys-utils/nsenter.c:88
msgid " -r, --root[=<dir>] set the root directory\n"
msgstr ""
-#: sys-utils/nsenter.c:87
+#: sys-utils/nsenter.c:89
msgid " -w, --wd[=<dir>] set the working directory\n"
msgstr ""
-#: sys-utils/nsenter.c:88
+#: sys-utils/nsenter.c:90
msgid " -F, --no-fork do not fork before exec'ing <program>\n"
msgstr ""
-#: sys-utils/nsenter.c:90
+#: sys-utils/nsenter.c:92
msgid " -Z, --follow-context set SELinux context according to --target PID\n"
msgstr ""
-#: sys-utils/nsenter.c:116
+#: sys-utils/nsenter.c:118
#, c-format
msgid "neither filename nor target pid supplied for %s"
msgstr ""
-#: sys-utils/nsenter.c:266
+#: sys-utils/nsenter.c:275
#, fuzzy
msgid "failed to parse uid"
msgstr "%s: невозможно открыть : %s\n"
-#: sys-utils/nsenter.c:270
+#: sys-utils/nsenter.c:279
#, fuzzy
msgid "failed to parse gid"
msgstr "%s: невозможно открыть : %s\n"
-#: sys-utils/nsenter.c:306
+#: sys-utils/nsenter.c:315
msgid "no target PID specified for --follow-context"
msgstr ""
-#: sys-utils/nsenter.c:308
+#: sys-utils/nsenter.c:317
#, c-format
msgid "failed to get %d SELinux context"
msgstr "не удалось получить контекст SELinux для %d"
-#: sys-utils/nsenter.c:311
+#: sys-utils/nsenter.c:320
#, fuzzy, c-format
msgid "failed to set exec context to '%s'"
msgstr "Ошибка записи раздела на %s\n"
-#: sys-utils/nsenter.c:356
+#: sys-utils/nsenter.c:365
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr ""
-#: sys-utils/nsenter.c:367
+#: sys-utils/nsenter.c:376
#, fuzzy
msgid "cannot open current working directory"
msgstr "Невозможно открыть файл '%s'"
-#: sys-utils/nsenter.c:374
+#: sys-utils/nsenter.c:383
msgid "change directory by root file descriptor failed"
msgstr ""
-#: sys-utils/nsenter.c:377
+#: sys-utils/nsenter.c:386
#, fuzzy
msgid "chroot failed"
msgstr "mount завершился неудачей"
-#: sys-utils/nsenter.c:387
+#: sys-utils/nsenter.c:396
msgid "change directory by working directory file descriptor failed"
msgstr ""
-#: sys-utils/nsenter.c:398 sys-utils/setpriv.c:816 sys-utils/setpriv.c:820
+#: sys-utils/nsenter.c:407 sys-utils/setpriv.c:816 sys-utils/setpriv.c:820
#, fuzzy
msgid "setgroups failed"
msgstr "setuid() завершился неудачей"
@@ -15237,6 +15256,11 @@ msgstr "не указана архитектура"
msgid "failed to set personality to %s"
msgstr "Ошибка записи раздела на %s\n"
+#: sys-utils/setarch.c:395
+#, fuzzy, c-format
+msgid "Execute command `%s'.\n"
+msgstr "Подается команды даты: %s\n"
+
#: sys-utils/setpriv.c:97
msgid "Run a program with different privilege settings.\n"
msgstr "Запуск программы с различными настройками доступа.\n"
@@ -15655,7 +15679,7 @@ msgstr "Не суперпользователь."
msgid "%s: swapoff failed"
msgstr ""
-#: sys-utils/swapoff.c:119 sys-utils/swapon.c:728
+#: sys-utils/swapoff.c:119 sys-utils/swapon.c:787
#, fuzzy, c-format
msgid " %s [options] [<spec>]\n"
msgstr "Использование: %s [опции] устройство...\n"
@@ -15712,151 +15736,158 @@ msgstr ""
msgid "swap label"
msgstr "без метки, "
-#: sys-utils/swapon.c:235
+#: sys-utils/swapon.c:246
#, c-format
msgid "%s\t\t\t\tType\t\tSize\tUsed\tPriority\n"
msgstr "%s\t\t\t\tТип\t\tРазмер\tИсп-но\tПриоритет\n"
-#: sys-utils/swapon.c:235
+#: sys-utils/swapon.c:246
msgid "Filename"
msgstr "Имя файла"
-#: sys-utils/swapon.c:298
+#: sys-utils/swapon.c:312
#, c-format
msgid "%s: reinitializing the swap."
msgstr ""
-#: sys-utils/swapon.c:357
+#: sys-utils/swapon.c:376
#, fuzzy, c-format
msgid "%s: lseek failed"
msgstr "поиск завершился неудачей"
-#: sys-utils/swapon.c:363
+#: sys-utils/swapon.c:382
#, fuzzy, c-format
msgid "%s: write signature failed"
msgstr "невозможно записать страницу с сигнатурой"
-#: sys-utils/swapon.c:446
-#, c-format
-msgid "%s: found swap signature: version %ud, page-size %d, %s byte order"
-msgstr ""
-
-#: sys-utils/swapon.c:451
-msgid "different"
-msgstr "отличается"
-
-#: sys-utils/swapon.c:451
-msgid "same"
-msgstr "одинаковый"
-
-#: sys-utils/swapon.c:510
+#: sys-utils/swapon.c:536
#, fuzzy, c-format
msgid "%s: skipping - it appears to have holes."
msgstr "%s: Пропускается файл %s - похоже в нём имеются дыры.\n"
-#: sys-utils/swapon.c:518
+#: sys-utils/swapon.c:544
#, fuzzy, c-format
msgid "%s: get size failed"
msgstr "поиск завершился неудачей"
-#: sys-utils/swapon.c:524
+#: sys-utils/swapon.c:550
#, c-format
msgid "%s: read swap header failed"
msgstr ""
-#: sys-utils/swapon.c:534
+#: sys-utils/swapon.c:555
+#, c-format
+msgid "%s: found signature [pagesize=%d, signature=%s]"
+msgstr ""
+
+#: sys-utils/swapon.c:566
#, c-format
msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
msgstr ""
-#: sys-utils/swapon.c:539
+#: sys-utils/swapon.c:571
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr ""
-#: sys-utils/swapon.c:548
+#: sys-utils/swapon.c:581
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr ""
-#: sys-utils/swapon.c:554
+#: sys-utils/swapon.c:587
#, c-format
msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr ""
-#: sys-utils/swapon.c:563
+#: sys-utils/swapon.c:596
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr ""
-#: sys-utils/swapon.c:589
+#: sys-utils/swapon.c:666
#, fuzzy, c-format
msgid "swapon %s\n"
msgstr "%s на %s\n"
-#: sys-utils/swapon.c:629
+#: sys-utils/swapon.c:670
#, fuzzy, c-format
msgid "%s: swapon failed"
msgstr "fsync завершился неудачей"
-#: sys-utils/swapon.c:731
+#: sys-utils/swapon.c:742
+#, fuzzy, c-format
+msgid "%s: noauto option -- ignored"
+msgstr "%s: ошибка разбора в строке %d — игнорируется"
+
+#: sys-utils/swapon.c:764
+#, fuzzy, c-format
+msgid "%s: already active -- ignored"
+msgstr "%s: ошибка разбора в строке %d — игнорируется"
+
+#: sys-utils/swapon.c:770
+#, fuzzy, c-format
+msgid "%s: unaccessible -- ignored"
+msgstr "%s: невозможно записать inode'ы"
+
+#: sys-utils/swapon.c:790
msgid "Enable devices and files for paging and swapping.\n"
msgstr ""
-#: sys-utils/swapon.c:734
+#: sys-utils/swapon.c:793
#, fuzzy
msgid " -a, --all enable all swaps from /etc/fstab\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/swapon.c:735
+#: sys-utils/swapon.c:794
msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n"
msgstr ""
-#: sys-utils/swapon.c:736
+#: sys-utils/swapon.c:795
msgid " -e, --ifexists silently skip devices that do not exist\n"
msgstr ""
-#: sys-utils/swapon.c:737
+#: sys-utils/swapon.c:796
msgid " -f, --fixpgsz reinitialize the swap space if necessary\n"
msgstr ""
-#: sys-utils/swapon.c:738
+#: sys-utils/swapon.c:797
msgid " -o, --options <list> comma-separated list of swap options\n"
msgstr ""
-#: sys-utils/swapon.c:739
+#: sys-utils/swapon.c:798
msgid " -p, --priority <prio> specify the priority of the swap device\n"
msgstr ""
-#: sys-utils/swapon.c:740
+#: sys-utils/swapon.c:799
msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n"
msgstr ""
-#: sys-utils/swapon.c:741
+#: sys-utils/swapon.c:800
msgid " --show[=<columns>] display summary in definable table\n"
msgstr ""
-#: sys-utils/swapon.c:742
+#: sys-utils/swapon.c:801
#, fuzzy
msgid " --noheadings don't print table heading (with --show)\n"
msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
-#: sys-utils/swapon.c:743
+#: sys-utils/swapon.c:802
#, fuzzy
msgid " --raw use the raw output format (with --show)\n"
msgstr " -V, --version Вывод информации о версии\n"
-#: sys-utils/swapon.c:744
+#: sys-utils/swapon.c:803
#, fuzzy
msgid " --bytes display swap size in bytes in --show output\n"
msgstr " --help показать эту справку и выйти\n"
-#: sys-utils/swapon.c:745
+#: sys-utils/swapon.c:804
#, fuzzy
msgid " -v, --verbose verbose mode\n"
msgstr " -V, --version Вывод информации о версии\n"
-#: sys-utils/swapon.c:751
+#: sys-utils/swapon.c:810
msgid ""
"\n"
"The <spec> parameter:\n"
@@ -15870,7 +15901,7 @@ msgid ""
" <file> name of file to be used\n"
msgstr ""
-#: sys-utils/swapon.c:761
+#: sys-utils/swapon.c:820
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
@@ -15879,24 +15910,24 @@ msgid ""
"If no policy is selected, both discard types are enabled (default).\n"
msgstr ""
-#: sys-utils/swapon.c:766
+#: sys-utils/swapon.c:825
#, fuzzy
msgid ""
"\n"
"Available columns (for --show):\n"
msgstr "Доступные команды:\n"
-#: sys-utils/swapon.c:840
+#: sys-utils/swapon.c:903
#, fuzzy
msgid "failed to parse priority"
msgstr "Ошибка записи раздела на %s\n"
-#: sys-utils/swapon.c:859
+#: sys-utils/swapon.c:922
#, c-format
msgid "unsupported discard policy: %s"
msgstr ""
-#: sys-utils/swapon-common.c:74
+#: sys-utils/swapon-common.c:73
#, fuzzy, c-format
msgid "cannot find the device for %s"
msgstr "%s: невозможно найти устройство для %s\n"
@@ -16078,7 +16109,7 @@ msgstr "%s использует прерывание %d\n"
msgid "%s using polling\n"
msgstr "%s использует опрос\n"
-#: sys-utils/umount.c:76
+#: sys-utils/umount.c:75
#, c-format
msgid ""
" %1$s [-hV]\n"
@@ -16086,92 +16117,92 @@ msgid ""
" %1$s [options] <source> | <directory>\n"
msgstr ""
-#: sys-utils/umount.c:82
+#: sys-utils/umount.c:81
msgid "Unmount filesystems.\n"
msgstr "Размонтирование файловых систем.\n"
-#: sys-utils/umount.c:85
+#: sys-utils/umount.c:84
msgid " -a, --all unmount all filesystems\n"
msgstr " -a, --all размонтировать все файловые системы\n"
-#: sys-utils/umount.c:86
+#: sys-utils/umount.c:85
msgid ""
" -A, --all-targets unmount all mountpoints for the given device in the\n"
" current namespace\n"
msgstr ""
-#: sys-utils/umount.c:88
+#: sys-utils/umount.c:87
msgid " -c, --no-canonicalize don't canonicalize paths\n"
msgstr ""
-#: sys-utils/umount.c:89
+#: sys-utils/umount.c:88
msgid " -d, --detach-loop if mounted loop device, also free this loop device\n"
msgstr ""
-#: sys-utils/umount.c:90
+#: sys-utils/umount.c:89
msgid " --fake dry run; skip the umount(2) syscall\n"
msgstr ""
-#: sys-utils/umount.c:91
+#: sys-utils/umount.c:90
msgid " -f, --force force unmount (in case of an unreachable NFS system)\n"
msgstr ""
-#: sys-utils/umount.c:92
+#: sys-utils/umount.c:91
msgid " -i, --internal-only don't call the umount.<type> helpers\n"
msgstr ""
-#: sys-utils/umount.c:94
+#: sys-utils/umount.c:93
msgid " -l, --lazy detach the filesystem now, clean up things later\n"
msgstr ""
-#: sys-utils/umount.c:95
+#: sys-utils/umount.c:94
msgid " -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
msgstr ""
-#: sys-utils/umount.c:96
+#: sys-utils/umount.c:95
msgid " -R, --recursive recursively unmount a target with all its children\n"
msgstr ""
-#: sys-utils/umount.c:97
+#: sys-utils/umount.c:96
msgid " -r, --read-only in case unmounting fails, try to remount read-only\n"
msgstr ""
-#: sys-utils/umount.c:98
+#: sys-utils/umount.c:97
#, fuzzy
msgid " -t, --types <list> limit the set of filesystem types\n"
msgstr " l список типов известных файловых систем"
-#: sys-utils/umount.c:143
+#: sys-utils/umount.c:142
#, c-format
msgid "%s (%s) unmounted"
msgstr "%s (%s) размонтирован"
-#: sys-utils/umount.c:145
+#: sys-utils/umount.c:144
#, c-format
msgid "%s unmounted"
msgstr "%s размонтирован."
-#: sys-utils/umount.c:210
+#: sys-utils/umount.c:209
#, fuzzy, c-format
msgid "%s: umount failed"
msgstr "mount завершился неудачей"
-#: sys-utils/umount.c:219
+#: sys-utils/umount.c:218
#, c-format
msgid "%s: filesystem was unmounted, but mount(8) failed"
msgstr ""
-#: sys-utils/umount.c:233
+#: sys-utils/umount.c:232
#, fuzzy, c-format
msgid "%s: invalid block device"
msgstr "umount: %s: неверное блочное устройство"
-#: sys-utils/umount.c:239
+#: sys-utils/umount.c:238
#, fuzzy, c-format
msgid "%s: can't write superblock"
msgstr "umount: %s: невозможно записать суперблок"
-#: sys-utils/umount.c:242
+#: sys-utils/umount.c:241
#, c-format
msgid ""
"%s: target is busy\n"
@@ -16179,159 +16210,164 @@ msgid ""
" use the device is found by lsof(8) or fuser(1).)"
msgstr ""
-#: sys-utils/umount.c:249
+#: sys-utils/umount.c:248
#, fuzzy, c-format
msgid "%s: mountpoint not found"
msgstr "umount: %s: не найден"
-#: sys-utils/umount.c:251
+#: sys-utils/umount.c:250
msgid "undefined mountpoint"
msgstr ""
-#: sys-utils/umount.c:254
+#: sys-utils/umount.c:253
#, fuzzy, c-format
msgid "%s: must be superuser to unmount"
msgstr "umount: %s: необходимо иметь права суперпользователя для размонтирования"
-#: sys-utils/umount.c:257
+#: sys-utils/umount.c:256
#, fuzzy, c-format
msgid "%s: block devices are not permitted on filesystem"
msgstr "umount: %s: блочные устройства на fs запрещены"
-#: sys-utils/umount.c:308
+#: sys-utils/umount.c:307
#, fuzzy
msgid "failed to set umount target"
msgstr "Ошибка записи раздела на %s\n"
-#: sys-utils/umount.c:324
+#: sys-utils/umount.c:323
msgid "libmount table allocation failed"
msgstr ""
-#: sys-utils/umount.c:367 sys-utils/umount.c:447
+#: sys-utils/umount.c:366 sys-utils/umount.c:446
#, fuzzy
msgid "libmount iterator allocation failed"
msgstr "malloc завершился неудачей"
-#: sys-utils/umount.c:373
+#: sys-utils/umount.c:372
#, fuzzy, c-format
msgid "failed to get child fs of %s"
msgstr "Ошибка записи раздела на %s\n"
-#: sys-utils/umount.c:411 sys-utils/umount.c:434
+#: sys-utils/umount.c:410 sys-utils/umount.c:433
#, fuzzy, c-format
msgid "%s: not found"
msgstr "umount: %s: не найден"
-#: sys-utils/umount.c:441
+#: sys-utils/umount.c:440
#, c-format
msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)."
msgstr ""
-#: sys-utils/unshare.c:88
+#: sys-utils/unshare.c:89
#, fuzzy, c-format
msgid "unsupported --setgroups argument '%s'"
msgstr "%s: неизвестный аргумент: %s\n"
-#: sys-utils/unshare.c:109 sys-utils/unshare.c:124
+#: sys-utils/unshare.c:110 sys-utils/unshare.c:125
#, fuzzy, c-format
msgid "write failed %s"
msgstr "(Следующий файл: %s)"
-#: sys-utils/unshare.c:147
+#: sys-utils/unshare.c:148
#, fuzzy, c-format
msgid "unsupported propagation mode: %s"
msgstr "Введите тип файловой системы:"
-#: sys-utils/unshare.c:156
+#: sys-utils/unshare.c:157
msgid "cannot change root filesystem propagation"
msgstr ""
-#: sys-utils/unshare.c:201
+#: sys-utils/unshare.c:202
#, fuzzy, c-format
msgid "cannot stat %s"
msgstr "невозможно определить состояние устройства %s"
-#: sys-utils/unshare.c:212
+#: sys-utils/unshare.c:213
#, fuzzy
msgid "pipe failed"
msgstr "openpty завершился неудачей\n"
-#: sys-utils/unshare.c:226
+#: sys-utils/unshare.c:227
#, fuzzy
msgid "failed to read pipe"
msgstr "Невозможно прочитать %s\n"
-#: sys-utils/unshare.c:249
+#: sys-utils/unshare.c:250
msgid "Run a program with some namespaces unshared from the parent.\n"
msgstr ""
-#: sys-utils/unshare.c:252
+#: sys-utils/unshare.c:253
#, fuzzy
msgid " -m, --mount[=<file>] unshare mounts namespace\n"
msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
-#: sys-utils/unshare.c:253
+#: sys-utils/unshare.c:254
#, fuzzy
msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n"
msgstr " -q, --quiet Отключение отчета об ошибках getopt(3)\n"
-#: sys-utils/unshare.c:254
+#: sys-utils/unshare.c:255
#, fuzzy
msgid " -i, --ipc[=<file>] unshare System V IPC namespace\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/unshare.c:255
+#: sys-utils/unshare.c:256
#, fuzzy
msgid " -n, --net[=<file>] unshare network namespace\n"
msgstr " -T, --test Проверка версии getopt(1)\n"
-#: sys-utils/unshare.c:256
+#: sys-utils/unshare.c:257
#, fuzzy
msgid " -p, --pid[=<file>] unshare pid namespace\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/unshare.c:257
+#: sys-utils/unshare.c:258
#, fuzzy
msgid " -U, --user[=<file>] unshare user namespace\n"
msgstr " -h, --help Это небольшое руководство по использованию\n"
-#: sys-utils/unshare.c:258
+#: sys-utils/unshare.c:259
+#, fuzzy
+msgid " -C, --cgroup[=<file>] unshare cgroup namespace\n"
+msgstr " -u, --unqote Не заключать в кавычки выходные данные\n"
+
+#: sys-utils/unshare.c:260
msgid " -f, --fork fork before launching <program>\n"
msgstr ""
-#: sys-utils/unshare.c:259
+#: sys-utils/unshare.c:261
msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n"
msgstr ""
-#: sys-utils/unshare.c:260
+#: sys-utils/unshare.c:262
msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgstr ""
-#: sys-utils/unshare.c:261
+#: sys-utils/unshare.c:263
msgid ""
" --propagation slave|shared|private|unchanged\n"
" modify mount propagation in mount namespace\n"
msgstr ""
-#: sys-utils/unshare.c:263
+#: sys-utils/unshare.c:265
msgid " -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"
msgstr ""
-#: sys-utils/unshare.c:378
+#: sys-utils/unshare.c:386
#, fuzzy
msgid "unshare failed"
msgstr "поиск завершился неудачей"
-#: sys-utils/unshare.c:422
+#: sys-utils/unshare.c:430
#, fuzzy
msgid "child exit failed"
msgstr "выполнение завершилось неудачей\n"
-#: sys-utils/unshare.c:429
+#: sys-utils/unshare.c:437
msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
msgstr ""
-#: sys-utils/unshare.c:449
+#: sys-utils/unshare.c:457
#, fuzzy, c-format
msgid "mount %s failed"
msgstr "mount завершился неудачей"
@@ -18267,6 +18303,23 @@ msgstr "неизвестная escape-последовательность во
msgid "Input line too long."
msgstr "Строка входных данных слишком длинная."
+#~ msgid "%s: parse error at line %d"
+#~ msgstr "%s: ошибка разбора в строке %d"
+
+#, fuzzy
+#~ msgid "%s: parse error: ignore entry at line %d."
+#~ msgstr "последняя первая строка"
+
+#, fuzzy
+#~ msgid "cannot not setup timer"
+#~ msgstr "невозможно открыть %s"
+
+#~ msgid "different"
+#~ msgstr "отличается"
+
+#~ msgid "same"
+#~ msgstr "одинаковый"
+
#~ msgid "cannot access file %s"
#~ msgstr "нет доступа к файлу %s"