po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 26 insertions, 13 deletions

diff --git a/po/ru.po b/po/ru.po
index ee59c2993..1be1f059c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-12-09 11:32+0100\n"
+"POT-Creation-Date: 2009-12-10 21:51+0100\n"
 "PO-Revision-Date: 2006-03-07 12:42+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -3213,7 +3213,7 @@ msgstr "Примечание: размер сектора - %d (не %d)\n"
 #, c-format
 msgid ""
 "\n"
-"WARNING: the device provides alignment_offset, but the offset does not \n"
+"WARNING: the device provides alignment_offset, but the offset does not\n"
 "match with device geometry.\n"
 "\n"
 msgstr ""
@@ -3616,7 +3616,7 @@ msgstr ""
 
 #: fdisk/fdisk.c:2209
 #, fuzzy, c-format
-msgid "%lld unallocated %d-byte sectors\n"
+msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld незанятых секторов\n"
 
 #: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
@@ -8638,11 +8638,11 @@ msgid ""
 msgstr ""
 
 #: misc-utils/wipefs.c:322
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"For more information see wipefs(1).\n"
-msgstr ""
+"For more information see wipefs(8).\n"
+msgstr "Информация finger изменена.\n"
 
 #: misc-utils/wipefs.c:373
 msgid "--offset and --all are mutually exclusive"
@@ -9541,9 +9541,18 @@ msgstr "Открытие %s завершилось неудачей"
 
 #: mount/swapon.c:350
 #, c-format
-msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
+msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
+#: mount/swapon.c:355
+msgid "different"
+msgstr ""
+
+#: mount/swapon.c:355
+#, fuzzy
+msgid "same"
+msgstr "Имя"
+
 #: mount/swapon.c:370
 #, fuzzy, c-format
 msgid "%s: stat failed"
@@ -9867,6 +9876,11 @@ msgstr "Ошибка записи раздела на %s\n"
 msgid "failed to set pid %d's policy"
 msgstr "Ошибка записи раздела на %s\n"
 
+#: schedutils/chrt.c:242
+#, fuzzy
+msgid "new"
+msgstr "Новый"
+
 #: schedutils/chrt.c:248
 #, fuzzy, c-format
 msgid "failed to execute %s"
@@ -11104,7 +11118,7 @@ msgstr ""
 msgid "missing comma"
 msgstr "отсутствует запятая"
 
-#: sys-utils/readprofile.c:72
+#: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
 msgstr "нехватка памяти"
@@ -11620,11 +11634,6 @@ msgstr "(Следующий файл: %s)"
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Нажмите пробел для продолжения, 'q' для выхода.]"
 
-#: text-utils/more.c:798
-#, fuzzy
-msgid "out if memory"
-msgstr "нехватка памяти"
-
 #: text-utils/more.c:1206
 #, c-format
 msgid "...back %d pages"
@@ -12027,6 +12036,10 @@ msgstr "Строка входных данных слишком длинная.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Не хватает памяти при увеличении буфера.\n"
 
+#, fuzzy
+#~ msgid "out if memory"
+#~ msgstr "нехватка памяти"
+
 #~ msgid "# partition table of %s\n"
 #~ msgstr "# таблица разделов %s\n"