summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>2009-03-14 20:42:41 +0000
committerNickolay V. Shmyrev <nshmyrev@src.gnome.org>2009-03-14 20:42:41 +0000
commita013aaf0674ae95aa0870c1208e0d28016bfc70a (patch)
treeee9eb979f7754bbafcc87ff0e3044c844a386074 /po/ru.po
parentefdea28c96b9ac4bdceebb162955dfc995ba83f5 (diff)
downloadgvfs-a013aaf0674ae95aa0870c1208e0d28016bfc70a.tar.gz
Updated Russian translation by Yuriy Penkin.
2009-03-14 Nickolay V. Shmyrev <nshmyrev@yandex.ru> * ru.po: Updated Russian translation by Yuriy Penkin. svn path=/trunk/; revision=2325
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po1104
1 files changed, 613 insertions, 491 deletions
diff --git a/po/ru.po b/po/ru.po
index 933232e4..7ea7ab7f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gvfs trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 21:43+0400\n"
-"PO-Revision-Date: 2008-09-21 20:29+0300\n"
+"POT-Creation-Date: 2009-03-14 23:40+0300\n"
+"PO-Revision-Date: 2009-03-14 23:24+0300\n"
"Last-Translator: Yuriy Penkin <yuriy.penkin@gmail.com>\n"
"Language-Team: Russian <en@li.org>\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "Функция get_info вернула неверное значение
msgid "Invalid return value from query_info"
msgstr "Функция query_info вернула неверное значение"
-#: ../client/gdaemonfile.c:894
+#: ../client/gdaemonfile.c:894 ../client/gvfsiconloadable.c:338
msgid "Couldn't get stream file descriptor"
msgstr "Не удаётся получить описание файла потока"
@@ -37,12 +37,13 @@ msgstr "Не удаётся получить описание файла пот
#: ../client/gdaemonfile.c:1055 ../client/gdaemonfile.c:1114
#: ../client/gdaemonfile.c:1176 ../client/gdaemonfile.c:2252
#: ../client/gdaemonfile.c:2330 ../client/gdaemonfile.c:2589
+#: ../client/gvfsiconloadable.c:370
msgid "Invalid return value from open"
msgstr "Функция open вернула неверное значение"
#: ../client/gdaemonfile.c:1006 ../client/gdaemonfile.c:1065
#: ../client/gdaemonfile.c:1124 ../client/gdaemonfile.c:1186
-#: ../client/gdaemonfile.c:2220
+#: ../client/gdaemonfile.c:2220 ../client/gvfsiconloadable.c:155
msgid "Didn't get stream file descriptor"
msgstr "Дескриптор файла потока не был получен"
@@ -77,67 +78,70 @@ msgstr "Получено неверное значение от функции m
msgid "Invalid return value from monitor_file"
msgstr "Получено неверное значение от функции monitor_file"
-#: ../client/gdaemonfileinputstream.c:450
-#: ../client/gdaemonfileinputstream.c:458
-#: ../client/gdaemonfileinputstream.c:1300
-#: ../client/gdaemonfileinputstream.c:1310
-#: ../client/gdaemonfileoutputstream.c:402
-#: ../client/gdaemonfileoutputstream.c:410
-#: ../client/gdaemonfileoutputstream.c:1054
-#: ../client/gdaemonfileoutputstream.c:1064
+#: ../client/gdaemonfileenumerator.c:351
+#: ../client/gdaemonfileinputstream.c:630
+#: ../client/gdaemonfileinputstream.c:783
+#: ../client/gdaemonfileinputstream.c:901
+#: ../client/gdaemonfileinputstream.c:1149
+#: ../client/gdaemonfileinputstream.c:1391
+#: ../client/gdaemonfileoutputstream.c:506
+#: ../client/gdaemonfileoutputstream.c:681
+#: ../client/gdaemonfileoutputstream.c:873
+#: ../client/gdaemonfileoutputstream.c:1052
+#: ../daemon/gvfsbackendobexftp.c:1060 ../daemon/gvfsbackendobexftp.c:1081
+#: ../daemon/gvfsbackendobexftp.c:1200 ../daemon/gvfsbackendobexftp.c:1337
+#: ../daemon/gvfsbackendobexftp.c:1401 ../daemon/gvfsbackendobexftp.c:1601
+#: ../daemon/gvfsbackendobexftp.c:1708 ../daemon/gvfsbackendobexftp.c:1858
+#: ../daemon/gvfsbackendobexftp.c:1885 ../daemon/gvfsbackendobexftp.c:1944
+#: ../daemon/gvfsbackendobexftp.c:1966 ../daemon/gvfsbackendobexftp.c:2029
+#: ../daemon/gvfsbackendobexftp.c:2048 ../daemon/gvfsbackendsmb.c:1139
+#: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:298
+#: ../monitor/proxy/gproxydrive.c:442 ../monitor/proxy/gproxydrive.c:526
+#: ../monitor/proxy/gproxydrive.c:644 ../monitor/proxy/gproxymount.c:455
+#: ../monitor/proxy/gproxymount.c:538 ../monitor/proxy/gproxyvolume.c:783
+#: ../monitor/proxy/gproxyvolume.c:860
+msgid "Operation was cancelled"
+msgstr "Действие было прервано"
+
+#: ../client/gdaemonfileinputstream.c:527
+#: ../client/gdaemonfileinputstream.c:535
+#: ../client/gdaemonfileinputstream.c:1682
+#: ../client/gdaemonfileinputstream.c:1692
+#: ../client/gdaemonfileoutputstream.c:450
+#: ../client/gdaemonfileoutputstream.c:458
+#: ../client/gdaemonfileoutputstream.c:1234
+#: ../client/gdaemonfileoutputstream.c:1244
#, c-format
msgid "Error in stream protocol: %s"
msgstr "Ошибка в протоколе потока: %s"
-#: ../client/gdaemonfileinputstream.c:458
-#: ../client/gdaemonfileinputstream.c:1310
-#: ../client/gdaemonfileoutputstream.c:410
-#: ../client/gdaemonfileoutputstream.c:1064
+#: ../client/gdaemonfileinputstream.c:535
+#: ../client/gdaemonfileinputstream.c:1692
+#: ../client/gdaemonfileoutputstream.c:458
+#: ../client/gdaemonfileoutputstream.c:1244
msgid "End of stream"
msgstr "Конец потока"
-#: ../client/gdaemonfileinputstream.c:518
-#: ../client/gdaemonfileinputstream.c:674
-#: ../client/gdaemonfileinputstream.c:782
-#: ../client/gdaemonfileinputstream.c:1032
-#: ../client/gdaemonfileoutputstream.c:458
-#: ../client/gdaemonfileoutputstream.c:636
-#: ../client/gdaemonfileoutputstream.c:831 ../daemon/gvfsbackendobexftp.c:772
-#: ../daemon/gvfsbackendobexftp.c:793 ../daemon/gvfsbackendobexftp.c:912
-#: ../daemon/gvfsbackendobexftp.c:1049 ../daemon/gvfsbackendobexftp.c:1113
-#: ../daemon/gvfsbackendobexftp.c:1250 ../daemon/gvfsbackendobexftp.c:1277
-#: ../daemon/gvfsbackendobexftp.c:1336 ../daemon/gvfsbackendobexftp.c:1358
-#: ../daemon/gvfsbackendobexftp.c:1418 ../daemon/gvfsbackendobexftp.c:1437
-#: ../daemon/gvfsbackendsmb.c:1087 ../daemon/gvfsbackendtest.c:87
-#: ../daemon/gvfsbackendtest.c:120 ../daemon/gvfsbackendtest.c:183
-#: ../daemon/gvfschannel.c:298
-msgid "Operation was cancelled"
-msgstr "Действие было прервано"
-
-#: ../client/gdaemonfileinputstream.c:1207
-#: ../client/gdaemonfileoutputstream.c:942
+#: ../client/gdaemonfileinputstream.c:1330
+#: ../client/gdaemonfileoutputstream.c:981
msgid "Seek not supported on stream"
msgstr "Поиск в потоке не поддерживается"
-#: ../client/gdaemonfileinputstream.c:1237
-msgid "The query info operation is not supported"
-msgstr "Операция запроса информации не поддерживается"
-
-#: ../client/gdaemonfileoutputstream.c:991
-#, c-format
-msgid "Query info not supported on stream"
-msgstr "Запрос информации не поддерживается потоком"
-
-#: ../client/gdaemonvfs.c:757
+#: ../client/gdaemonvfs.c:830
#, c-format
msgid "Error while getting mount info: %s"
msgstr "Ошибка получения информации о монтировании: %s"
-#: ../client/gvfsdaemondbus.c:568 ../client/gvfsdaemondbus.c:999
+#: ../client/gvfsdaemondbus.c:567 ../client/gvfsdaemondbus.c:998
#, c-format
msgid "Error connecting to daemon: %s"
msgstr "Ошибка подключения к демону: %s"
+#: ../client/gvfsiconloadable.c:145
+msgid "Invalid return value from open_icon_for_read"
+msgstr "Функция open_icon_for_read вернула неверное значение"
+
#: ../common/gsysutils.c:136
#, c-format
msgid "Error creating socket: %s"
@@ -148,89 +152,156 @@ msgstr "Ошибка создания сокета: %s"
msgid "Error connecting to socket: %s"
msgstr "Ошибка подключения к сокету: %s"
-#: ../common/gvfsdaemonprotocol.c:515
+#: ../common/gvfsdaemonprotocol.c:454
msgid "Invalid file info format"
msgstr "Неверный формат информации о файле"
-#: ../common/gvfsdaemonprotocol.c:532
+#: ../common/gvfsdaemonprotocol.c:471
msgid "Invalid attribute info list content"
msgstr "Неверное содержимое списка информации об атрибутах."
-#: ../daemon/daemon-main.c:63 ../daemon/daemon-main.c:206
+#: ../common/gvfsdnssdresolver.c:208
+#, c-format
+msgid "Error initializing Avahi: %s"
+msgstr "Ошибка при инициализации Avahi: %s"
+
+#: ../common/gvfsdnssdresolver.c:254
+#, c-format
+msgid "Error creating Avahi resolver: %s"
+msgstr "Ошибка при создания сервиса разрешения имён Avahi: %s"
+
+#. Translators:
+#. * - the first %s refers to the service type
+#. * - the second %s refers to the service name
+#. * - the third %s refers to the domain
+#.
+#: ../common/gvfsdnssdresolver.c:1099
+#, c-format
+msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\""
+msgstr "Ошибка при разрешении имени «%s» сервиса «%s» на «%s»"
+
+#. Translators:
+#. * - the first %s refers to the service type
+#. * - the second %s refers to the service name
+#. * - the third %s refers to the domain
+#. * - the fourth %s refers to the required TXT keys
+#.
+#: ../common/gvfsdnssdresolver.c:1125
+#, c-format
+msgid ""
+"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
+"records are missing. Keys required: \"%s\"."
+msgstr ""
+"Ошибка при разрешении имени «%s» сервиса «%s» на «%s». Одна или несколько TXT "
+"записей не найдены. Требуются ключи: «%s»"
+
+#. Translators:
+#. * - the first %s refers to the service type
+#. * - the second %s refers to the service name
+#. * - the third %s refers to the domain
+#.
+#: ../common/gvfsdnssdresolver.c:1142
+#, c-format
+msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
+msgstr "Истёк период ожидания «%s» сервиса «%s» на «%s»"
+
+#: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263
+#: ../common/gvfsdnssdutils.c:280
+#, c-format
+msgid "Malformed dns-sd encoded_triple '%s'"
+msgstr "Неверные параметры dns-sd «%s»"
+
+#: ../common/gvfsicon.c:250
+#, c-format
+msgid "Can't handle version %d of GVfsIcon encoding"
+msgstr "Не удалось обработать текстовое представление GVfsIcon версии %d"
+
+#: ../common/gvfsicon.c:260
+msgid "Malformed input data for GVfsIcon"
+msgstr "Некорректные входные данные для GVfsIcon"
+
+#: ../daemon/daemon-main.c:76 ../daemon/daemon-main.c:230
#, c-format
msgid "Error connecting to D-Bus: %s"
msgstr "Ошибка подключения к D-Bus: %s"
#. translators: This is the default daemon's application name,
#. * the %s is the type of the backend, like "ftp"
-#: ../daemon/daemon-main.c:78
+#: ../daemon/daemon-main.c:91
#, c-format
msgid "%s Filesystem Service"
msgstr "Служба файловой системы %s"
-#: ../daemon/daemon-main.c:97
+#: ../daemon/daemon-main.c:110
#, c-format
msgid "Error: %s"
msgstr "Ошибка: %s"
-#: ../daemon/daemon-main.c:131
+#: ../daemon/daemon-main.c:155
#, c-format
msgid "Usage: %s --spawner dbus-id object_path"
msgstr "Применение: %s --spawner dbus-id object_path"
-#: ../daemon/daemon-main.c:155 ../daemon/daemon-main.c:173
+#: ../daemon/daemon-main.c:179 ../daemon/daemon-main.c:197
#, c-format
msgid "Usage: %s key=value key=value ..."
msgstr "Применение: %s key=value key=value ..."
-#: ../daemon/daemon-main.c:171
+#: ../daemon/daemon-main.c:195
#, c-format
msgid "No mount type specified"
msgstr "Тип монтирования не указан"
-#: ../daemon/daemon-main.c:241
+#: ../daemon/daemon-main.c:265
#, c-format
msgid "mountpoint for %s already running"
msgstr "точка монтирования для %s уже запущена"
-#: ../daemon/daemon-main.c:252
+#: ../daemon/daemon-main.c:276
msgid "error starting mount daemon"
msgstr "ошибка запуска демона монтирования"
#. FIXME: this should really be "/ in %s", but can't change
#. due to string freeze.
#. Translators: This is the name of the root of an sftp share, like "/ on <hostname>"
-#: ../daemon/gvfsbackendarchive.c:315 ../daemon/gvfsbackendftp.c:963
-#: ../daemon/gvfsbackendsftp.c:1894
+#: ../daemon/gvfsbackendarchive.c:318 ../daemon/gvfsbackendftp.c:1096
+#: ../daemon/gvfsbackendsftp.c:1922
#, c-format
msgid "/ on %s"
msgstr "/ на %s"
-#: ../daemon/gvfsbackendarchive.c:515 ../daemon/gvfsbackendftp.c:1479
-#: ../daemon/gvfsbackendsftp.c:1553
+#: ../daemon/gvfsbackendarchive.c:518 ../daemon/gvfsbackendftp.c:1642
+#: ../daemon/gvfsbackendsftp.c:1587
msgid "No hostname specified"
msgstr "Имя узла не указано"
-#: ../daemon/gvfsbackendarchive.c:526 ../daemon/gvfsbackendarchive.c:555
-#: ../daemon/gvfsbackenddav.c:1456 ../daemon/gvfsbackendhttp.c:299
-#: ../daemon/gvfsbackendobexftp.c:603 ../daemon/gvfsbackendobexftp.c:614
-#: ../daemon/gvfsbackendsmb.c:623
+#: ../daemon/gvfsbackendarchive.c:529 ../daemon/gvfsbackendarchive.c:558
+#: ../daemon/gvfsbackenddav.c:1626 ../daemon/gvfsbackendhttp.c:306
+#: ../daemon/gvfsbackendobexftp.c:836 ../daemon/gvfsbackendobexftp.c:852
+#: ../daemon/gvfsbackendobexftp.c:871 ../daemon/gvfsbackendsmb.c:648
msgid "Invalid mount spec"
msgstr "Неверная спецификация монтирования"
-#: ../daemon/gvfsbackendarchive.c:636 ../daemon/gvfsbackendarchive.c:686
-#: ../daemon/gvfsbackendarchive.c:715 ../daemon/gvfsbackendcdda.c:921
-#: ../daemon/gvfsbackendcomputer.c:572 ../daemon/gvfsbackenddnssd.c:345
-#: ../daemon/gvfsbackendftp.c:2101 ../daemon/gvfsbackendnetwork.c:590
-#: ../daemon/gvfsbackendsmbbrowse.c:804 ../daemon/gvfsbackendsmbbrowse.c:871
-#: ../daemon/gvfsbackendsmbbrowse.c:1042 ../daemon/gvfsbackendsmbbrowse.c:1116
+#: ../daemon/gvfsbackendarchive.c:614 ../daemon/gvfsbackendarchive.c:658
+#: ../daemon/gvfsbackendarchive.c:708 ../daemon/gvfsbackendarchive.c:737
+#: ../daemon/gvfsbackendcdda.c:921 ../daemon/gvfsbackendcomputer.c:572
+#: ../daemon/gvfsbackenddnssd.c:398 ../daemon/gvfsbackendftp.c:2264
+#: ../daemon/gvfsbackendnetwork.c:646 ../daemon/gvfsbackendsmbbrowse.c:1085
+#: ../daemon/gvfsbackendsmbbrowse.c:1152 ../daemon/gvfsbackendsmbbrowse.c:1323
+#: ../daemon/gvfsbackendsmbbrowse.c:1392
#, c-format
msgid "File doesn't exist"
msgstr "Файл не существует"
-#: ../daemon/gvfsbackendarchive.c:724 ../daemon/gvfsbackendburn.c:680
-#: ../daemon/gvfsbackendcomputer.c:651 ../daemon/gvfsbackenddnssd.c:393
-#: ../daemon/gvfsbackendftp.c:912 ../daemon/gvfsbackendnetwork.c:637
+#: ../daemon/gvfsbackendarchive.c:622 ../daemon/gvfsbackendcomputer.c:590
+#: ../daemon/gvfsbackendgphoto2.c:1690 ../daemon/gvfsbackendobexftp.c:1046
+#: ../daemon/gvfsbackendsmb.c:691 ../daemon/gvfsbackendtrash.c:232
+msgid "Can't open directory"
+msgstr "Не удаётся открыть каталог"
+
+#: ../daemon/gvfsbackendarchive.c:746 ../daemon/gvfsbackendburn.c:680
+#: ../daemon/gvfsbackendcomputer.c:651 ../daemon/gvfsbackenddnssd.c:445
+#: ../daemon/gvfsbackendftp.c:1045 ../daemon/gvfsbackendnetwork.c:693
msgid "The file is not a directory"
msgstr "Этот файл не является каталогом"
@@ -245,18 +316,21 @@ msgstr "Не удаётся создать временный каталог"
#: ../daemon/gvfsbackendburn.c:405 ../daemon/gvfsbackendburn.c:416
#: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
-#: ../daemon/gvfsbackendburn.c:719 ../daemon/gvfsbackendburn.c:745
-#: ../daemon/gvfsbackendburn.c:783 ../daemon/gvfsbackendgphoto2.c:1098
-#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:2706
+#: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
+#: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
+#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendgphoto2.c:1089
+#: ../daemon/gvfsbackendgphoto2.c:2010 ../daemon/gvfsbackendgphoto2.c:2729
+#: ../daemon/gvfsbackendtrash.c:216
#, c-format
msgid "No such file or directory"
msgstr "Нет такого файла или каталога"
-#: ../daemon/gvfsbackendburn.c:425 ../daemon/gvfsbackenddav.c:2043
+#: ../daemon/gvfsbackendburn.c:425 ../daemon/gvfsbackenddav.c:2218
msgid "Directory not empty"
msgstr "Каталог не пустой"
-#: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:906
+#: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
+#: ../daemon/gvfsbackendobexftp.c:1783
msgid "Can't copy file over directory"
msgstr "Не удаётся скопировать файл поверх каталога"
@@ -265,12 +339,14 @@ msgstr "Не удаётся скопировать файл поверх кат
msgid "CD/DVD Creator"
msgstr "Создание CD/DVD"
-#: ../daemon/gvfsbackendburn.c:755 ../daemon/gvfsbackendburn.c:791
-#: ../daemon/gvfsbackendburn.c:926 ../daemon/gvfsbackendgphoto2.c:2780
+#: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
+#: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
+#: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
+#: ../daemon/gvfsbackendgphoto2.c:2803
msgid "File exists"
msgstr "Файл существует"
-#: ../daemon/gvfsbackendburn.c:829 ../daemon/gvfsjobcloseread.c:112
+#: ../daemon/gvfsbackendburn.c:828 ../daemon/gvfsjobcloseread.c:112
#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:169
#: ../daemon/gvfsjobcreatemonitor.c:140 ../daemon/gvfsjobcreatemonitor.c:151
#: ../daemon/gvfsjobcreatemonitor.c:174 ../daemon/gvfsjobcreatemonitor.c:192
@@ -279,47 +355,50 @@ msgstr "Файл существует"
#: ../daemon/gvfsjobmountmountable.c:156 ../daemon/gvfsjobmove.c:168
#: ../daemon/gvfsjobopenforread.c:130 ../daemon/gvfsjobopenforwrite.c:148
#: ../daemon/gvfsjobopenforwrite.c:162 ../daemon/gvfsjobopenforwrite.c:176
-#: ../daemon/gvfsjobpull.c:173 ../daemon/gvfsjobpush.c:173
-#: ../daemon/gvfsjobqueryattributes.c:135 ../daemon/gvfsjobqueryfsinfo.c:131
-#: ../daemon/gvfsjobqueryinfo.c:149 ../daemon/gvfsjobread.c:120
-#: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:150 ../daemon/gvfsjobsetdisplayname.c:127
-#: ../daemon/gvfsjobtrash.c:122 ../daemon/gvfsjobunmountmountable.c:132
+#: ../daemon/gvfsjobopeniconforread.c:120 ../daemon/gvfsjobpull.c:173
+#: ../daemon/gvfsjobpush.c:173 ../daemon/gvfsjobqueryattributes.c:135
+#: ../daemon/gvfsjobqueryfsinfo.c:131 ../daemon/gvfsjobqueryinfo.c:149
+#: ../daemon/gvfsjobqueryinforead.c:119 ../daemon/gvfsjobqueryinfowrite.c:119
+#: ../daemon/gvfsjobread.c:120 ../daemon/gvfsjobseekread.c:119
+#: ../daemon/gvfsjobseekwrite.c:119 ../daemon/gvfsjobsetattribute.c:150
+#: ../daemon/gvfsjobsetdisplayname.c:127 ../daemon/gvfsjobtrash.c:122
+#: ../daemon/gvfsjobunmountmountable.c:132
#: ../daemon/gvfsjobunmountmountable.c:146 ../daemon/gvfsjobwrite.c:120
msgid "Operation not supported by backend"
msgstr "Действие не поддерживается драйвером"
-#: ../daemon/gvfsbackendburn.c:854
+#: ../daemon/gvfsbackendburn.c:853
msgid "No such file or directory in target path"
msgstr "Нет такого файла или каталога в пути назначения"
-#: ../daemon/gvfsbackendburn.c:877
+#: ../daemon/gvfsbackendburn.c:876 ../daemon/gvfsbackendobexftp.c:1752
msgid "Can't copy directory over directory"
msgstr "Не удаётся скопировать каталог поверх каталога"
-#: ../daemon/gvfsbackendburn.c:886
+#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1760
+#: ../daemon/gvfsbackendobexftp.c:1791
msgid "Target file exists"
msgstr "Файл назначения уже существует"
-#: ../daemon/gvfsbackendburn.c:893
+#: ../daemon/gvfsbackendburn.c:892 ../daemon/gvfsbackendobexftp.c:1767
msgid "Can't recursively copy directory"
msgstr "Не удаётся скопировать каталог рекурсивно"
-#: ../daemon/gvfsbackendburn.c:952 ../daemon/gvfsbackendgphoto2.c:2360
-#: ../daemon/gvfsbackendgphoto2.c:2569 ../daemon/gvfsbackendgphoto2.c:2666
-#: ../daemon/gvfsbackendgphoto2.c:2759
+#: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:731
+#: ../daemon/gvfsbackendgphoto2.c:2383 ../daemon/gvfsbackendgphoto2.c:2592
+#: ../daemon/gvfsbackendgphoto2.c:2689 ../daemon/gvfsbackendgphoto2.c:2782
msgid "Not supported"
msgstr "Не поддерживается"
-#: ../daemon/gvfsbackendcdda.c:299 ../daemon/gvfsbackendgphoto2.c:1403
+#: ../daemon/gvfsbackendcdda.c:299 ../daemon/gvfsbackendgphoto2.c:1389
msgid "Cannot connect to the system bus"
msgstr "Не удаётся подключиться к системной шине"
-#: ../daemon/gvfsbackendcdda.c:310 ../daemon/gvfsbackendgphoto2.c:1415
+#: ../daemon/gvfsbackendcdda.c:310 ../daemon/gvfsbackendgphoto2.c:1401
msgid "Cannot create libhal context"
msgstr "Не удалось получить контекст libhal"
-#: ../daemon/gvfsbackendcdda.c:324 ../daemon/gvfsbackendgphoto2.c:1428
+#: ../daemon/gvfsbackendcdda.c:324 ../daemon/gvfsbackendgphoto2.c:1414
msgid "Cannot initialize libhal"
msgstr "Не удалось инициализировать libhal"
@@ -344,13 +423,13 @@ msgid "cdda mount on %s"
msgstr "подключение cdda на %s"
#: ../daemon/gvfsbackendcdda.c:378 ../daemon/gvfsbackendcdda.c:895
-#: ../monitor/hal/ghalmount.c:435 ../monitor/hal/ghalvolume.c:233
-#: ../monitor/hal/ghalvolume.c:254
+#: ../monitor/hal/ghalmount.c:325 ../monitor/hal/ghalvolume.c:225
+#: ../monitor/hal/ghalvolume.c:246
#, c-format
msgid "Audio Disc"
msgstr "Звуковой диск"
-#: ../daemon/gvfsbackendcdda.c:439 ../daemon/gvfsbackendgphoto2.c:1656
+#: ../daemon/gvfsbackendcdda.c:439 ../daemon/gvfsbackendgphoto2.c:1642
#, c-format
msgid "File system is busy: %d open file"
msgid_plural "File system is busy: %d open files"
@@ -374,7 +453,7 @@ msgstr "Ошибка программы \"paranoia\" на устройстве %
msgid "Error seeking in stream on drive %s"
msgstr "Ошибка поиска в потоке на устройстве %s"
-#: ../daemon/gvfsbackendcdda.c:914 ../daemon/gvfsbackendgphoto2.c:1713
+#: ../daemon/gvfsbackendcdda.c:914 ../daemon/gvfsbackendgphoto2.c:1698
#, c-format
msgid "No such file"
msgstr "Нет такого файла"
@@ -396,417 +475,423 @@ msgstr "Компьютер"
msgid "Filesystem"
msgstr "Файловая система"
-#: ../daemon/gvfsbackendcomputer.c:590 ../daemon/gvfsbackendgphoto2.c:1705
-#: ../daemon/gvfsbackendobexftp.c:758 ../daemon/gvfsbackendsmb.c:666
-#: ../daemon/gvfsbackendtrash.c:678 ../daemon/gvfsbackendtrash.c:1786
-msgid "Can't open directory"
-msgstr "Не удаётся открыть каталог"
-
-#: ../daemon/gvfsbackendcomputer.c:594 ../daemon/gvfsbackendcomputer.c:732
+#: ../daemon/gvfsbackendcomputer.c:594
msgid "Can't open mountable file"
msgstr "Не удаётся открыть монтируемый файл"
-#: ../daemon/gvfsbackendcomputer.c:780 ../daemon/gvfsbackendsftp.c:1037
+#: ../daemon/gvfsbackendcomputer.c:779 ../daemon/gvfsbackendsftp.c:1065
#, c-format
msgid "Internal error: %s"
msgstr "Внутренняя ошибка: %s"
-#: ../daemon/gvfsbackendcomputer.c:812 ../daemon/gvfsbackendcomputer.c:929
+#: ../daemon/gvfsbackendcomputer.c:811 ../daemon/gvfsbackendcomputer.c:928
msgid "Can't mount file"
msgstr "Не удаётся смонтировать файл"
-#: ../daemon/gvfsbackendcomputer.c:824
+#: ../daemon/gvfsbackendcomputer.c:823
msgid "No media in the drive"
msgstr "В устройстве нет диска"
-#: ../daemon/gvfsbackendcomputer.c:881 ../daemon/gvfsbackendcomputer.c:972
-#: ../daemon/gvfsbackendcomputer.c:1072
+#: ../daemon/gvfsbackendcomputer.c:880 ../daemon/gvfsbackendcomputer.c:971
+#: ../daemon/gvfsbackendcomputer.c:1071
msgid "Not a mountable file"
msgstr "Файл не является монтируемым"
-#: ../daemon/gvfsbackendcomputer.c:987
+#: ../daemon/gvfsbackendcomputer.c:986
msgid "Can't unmount file"
msgstr "Не удаётся отмонтировать файл"
-#: ../daemon/gvfsbackendcomputer.c:1103
+#: ../daemon/gvfsbackendcomputer.c:1102
msgid "Can't eject file"
msgstr "Не удаётся извлечь файл"
-#: ../daemon/gvfsbackenddav.c:503 ../daemon/gvfsbackenddav.c:1523
-#: ../daemon/gvfsbackendhttp.c:245
+#: ../daemon/gvfsbackenddav.c:561 ../daemon/gvfsbackenddav.c:1693
+#: ../daemon/gvfsbackendhttp.c:252
#, c-format
msgid "HTTP Error: %s"
msgstr "Ошибка HTTP: %s"
-#: ../daemon/gvfsbackenddav.c:520
+#: ../daemon/gvfsbackenddav.c:578
msgid "Could not parse response"
msgstr "Не удаётся разобрать ответ"
-#: ../daemon/gvfsbackenddav.c:529
+#: ../daemon/gvfsbackenddav.c:587
msgid "Empty response"
msgstr "Пустой ответ"
-#: ../daemon/gvfsbackenddav.c:537
+#: ../daemon/gvfsbackenddav.c:595
msgid "Unexpected reply from server"
msgstr "Неожиданный ответ от сервера"
-#: ../daemon/gvfsbackenddav.c:1156 ../daemon/gvfsbackenddav.c:1658
+#: ../daemon/gvfsbackenddav.c:1214 ../daemon/gvfsbackenddav.c:1833
msgid "Response invalid"
msgstr "Неверный ответ"
-#: ../daemon/gvfsbackenddav.c:1299
+#: ../daemon/gvfsbackenddav.c:1357
msgid "WebDAV share"
msgstr "Ресурс WebDAV"
-#: ../daemon/gvfsbackenddav.c:1301
+#: ../daemon/gvfsbackenddav.c:1359
#, c-format
msgid "Enter password for %s"
msgstr "Введите пароль для %s"
-#: ../daemon/gvfsbackenddav.c:1304
+#: ../daemon/gvfsbackenddav.c:1362
msgid "Please enter proxy password"
msgstr "Введите пароль прокси-сервера"
-#: ../daemon/gvfsbackenddav.c:1527 ../daemon/gvfsbackenddav.c:1531
+#: ../daemon/gvfsbackenddav.c:1697 ../daemon/gvfsbackenddav.c:1701
msgid "Not a WebDAV enabled share"
msgstr "Не является ресурсом WebDAV"
-#: ../daemon/gvfsbackenddav.c:1554
+#: ../daemon/gvfsbackenddav.c:1729
#, c-format
msgid "WebDAV on %s"
msgstr "WebDAV на %s"
-#: ../daemon/gvfsbackenddav.c:1614 ../daemon/gvfsbackenddav.c:1687
+#: ../daemon/gvfsbackenddav.c:1789 ../daemon/gvfsbackenddav.c:1862
msgid "Could not create request"
msgstr "Не удаётся создать запрос"
-#: ../daemon/gvfsbackenddav.c:1750 ../daemon/gvfsbackenddav.c:2003
-#: ../daemon/gvfsbackenddav.c:2114 ../daemon/gvfsbackendftp.c:1699
-#: ../daemon/gvfsbackendftp.c:2365 ../daemon/gvfsbackendsftp.c:3559
-#: ../daemon/gvfsbackendsmb.c:1822
+#: ../daemon/gvfsbackenddav.c:1925 ../daemon/gvfsbackenddav.c:2178
+#: ../daemon/gvfsbackenddav.c:2289 ../daemon/gvfsbackendftp.c:1862
+#: ../daemon/gvfsbackendftp.c:2528 ../daemon/gvfsbackendsftp.c:3793
+#: ../daemon/gvfsbackendsmb.c:1974
msgid "Target file already exists"
msgstr "Файл назначения уже существует"
-#: ../daemon/gvfsbackenddav.c:1823 ../daemon/gvfsbackendsftp.c:2807
-#: ../daemon/gvfsbackendsmb.c:1056
+#: ../daemon/gvfsbackenddav.c:1998 ../daemon/gvfsbackendsftp.c:2960
+#: ../daemon/gvfsbackendsmb.c:1108
msgid "The file was externally modified"
msgstr "Файл был изменён извне"
-#: ../daemon/gvfsbackenddav.c:1854 ../daemon/gvfsbackendsmb.c:1092
-#: ../daemon/gvfsbackendsmb.c:1839
+#: ../daemon/gvfsbackenddav.c:2029 ../daemon/gvfsbackendsmb.c:1144
+#: ../daemon/gvfsbackendsmb.c:1991
msgid "Backup file creation failed"
msgstr "Ошибка создания резервной копии файла"
-#. TODO: Name
-#: ../daemon/gvfsbackenddnssd.c:433
-msgid "dns-sd"
-msgstr "dns-sd"
+#. "separate": a link to dns-sd://local/
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:393
+msgid "Local Network"
+msgstr "Локальная сеть"
-#: ../daemon/gvfsbackenddnssd.c:669 ../daemon/gvfsbackendnetwork.c:731
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:797
msgid "Can't monitor file or directory."
msgstr "Не удаётся отслеживать состояние файла или каталога."
#. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:687
+#: ../daemon/gvfsbackenddnssd.c:754
msgid "Dns-SD"
msgstr "Dns-SD"
-#: ../daemon/gvfsbackenddnssd.c:688 ../daemon/gvfsbackendnetwork.c:676
-#: ../daemon/gvfsbackendnetwork.c:814 ../daemon/gvfsbackendnetwork.c:815
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:732
+#: ../daemon/gvfsbackendnetwork.c:882 ../daemon/gvfsbackendnetwork.c:883
msgid "Network"
msgstr "Сеть"
-#: ../daemon/gvfsbackendftp.c:236
+#: ../daemon/gvfsbackendftp.c:254
msgid "Accounts are unsupported"
msgstr "Учётные записи не поддерживаются"
-#: ../daemon/gvfsbackendftp.c:240
+#: ../daemon/gvfsbackendftp.c:258
msgid "Host closed connection"
msgstr "Узел закрыл соединение"
-#: ../daemon/gvfsbackendftp.c:244
+#: ../daemon/gvfsbackendftp.c:262
msgid "Cannot open data connection. Maybe your firewall prevents this?"
msgstr ""
"Не удаётся установить соединение данных. Проверьте, пожалуйста, настройки "
"брандмауэра."
-#: ../daemon/gvfsbackendftp.c:248
+#: ../daemon/gvfsbackendftp.c:266
msgid "Data connection closed"
msgstr "Соединение данных закрыто"
-#: ../daemon/gvfsbackendftp.c:255 ../daemon/gvfsbackendftp.c:259
+#: ../daemon/gvfsbackendftp.c:273 ../daemon/gvfsbackendftp.c:277
msgid "Operation failed"
msgstr "Сбой операции"
-#: ../daemon/gvfsbackendftp.c:264
+#: ../daemon/gvfsbackendftp.c:282
msgid "No space left on server"
msgstr "На сервере не осталось свободного места"
-#: ../daemon/gvfsbackendftp.c:272 ../daemon/gvfsbackendsftp.c:3868
+#: ../daemon/gvfsbackendftp.c:290 ../daemon/gvfsbackendsftp.c:4104
+#: ../daemon/gvfsbackendsmb.c:1638
msgid "Operation unsupported"
msgstr "Действие неподдерживается"
-#: ../daemon/gvfsbackendftp.c:276 ../daemon/gvfsbackendsftp.c:289
+#: ../daemon/gvfsbackendftp.c:294 ../daemon/gvfsbackendsftp.c:299
msgid "Permission denied"
msgstr "Доступ запрещен"
-#: ../daemon/gvfsbackendftp.c:280
+#: ../daemon/gvfsbackendftp.c:298
msgid "Page type unknown"
msgstr "Неизвестный тип страницы"
-#: ../daemon/gvfsbackendftp.c:284 ../daemon/gvfsbackendftp.c:2211
+#: ../daemon/gvfsbackendftp.c:302 ../daemon/gvfsbackendftp.c:2374
msgid "Invalid filename"
msgstr "Неверное имя файла"
-#: ../daemon/gvfsbackendftp.c:288 ../daemon/gvfsbackendftp.c:364
-#: ../daemon/gvfsbackendftp.c:393 ../daemon/gvfsbackendftp.c:412
-#: ../daemon/gvfsbackendftp.c:425 ../daemon/gvfsbackendftp.c:817
+#: ../daemon/gvfsbackendftp.c:306 ../daemon/gvfsbackendftp.c:389
+#: ../daemon/gvfsbackendftp.c:414 ../daemon/gvfsbackendftp.c:428
+#: ../daemon/gvfsbackendftp.c:441 ../daemon/gvfsbackendftp.c:931
msgid "Invalid reply"
msgstr "Неверный ответ"
-#: ../daemon/gvfsbackendftp.c:532
+#: ../daemon/gvfsbackendftp.c:549
msgid "broken transmission"
msgstr "сбой передачи"
-#: ../daemon/gvfsbackendftp.c:677 ../daemon/gvfsbackendftp.c:837
+#: ../daemon/gvfsbackendftp.c:713 ../daemon/gvfsbackendftp.c:854
msgid "Could not connect to host"
msgstr "Не удаётся подключиться к узлу"
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendftp.c:1496
+#, c-format
+msgid "Enter password for ftp as %s on %s"
+msgstr "Введите пароль ftp для пользователя %s на %s"
+
#. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:1337
+#: ../daemon/gvfsbackendftp.c:1499
#, c-format
msgid "Enter password for ftp on %s"
msgstr "Введите пароль для ftp на %s"
-#: ../daemon/gvfsbackendftp.c:1362 ../daemon/gvfsbackendsftp.c:874
+#: ../daemon/gvfsbackendftp.c:1525 ../daemon/gvfsbackendsftp.c:887
+#: ../daemon/gvfsbackendsmb.c:606 ../daemon/gvfsbackendsmbbrowse.c:986
msgid "Password dialog cancelled"
msgstr "Диалог ввода пароля прерван"
-#: ../daemon/gvfsbackendftp.c:1441
+#: ../daemon/gvfsbackendftp.c:1604
#, c-format
msgid "ftp on %s"
msgstr "ftp на %s"
#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:1445
+#: ../daemon/gvfsbackendftp.c:1608
#, c-format
msgid "ftp as %s on %s"
msgstr "ftp как %s на %s"
-#: ../daemon/gvfsbackendftp.c:1529 ../daemon/gvfsbackendsftp.c:1958
-#: ../daemon/gvfsbackendsftp.c:3550
+#: ../daemon/gvfsbackendftp.c:1692 ../daemon/gvfsbackendsftp.c:1986
+#: ../daemon/gvfsbackendsftp.c:3784
msgid "File is directory"
msgstr "Файл является каталогом"
-#: ../daemon/gvfsbackendftp.c:1751 ../daemon/gvfsbackendftp.c:2326
+#: ../daemon/gvfsbackendftp.c:1914 ../daemon/gvfsbackendftp.c:2489
+#: ../daemon/gvfsbackendsftp.c:2821
msgid "backups not supported yet"
msgstr "резервные копии еще не поддерживаются"
-#: ../daemon/gvfsbackendftp.c:1828
+#: ../daemon/gvfsbackendftp.c:1991
msgid "filename too long"
msgstr "имя файла слишком длинное"
-#: ../daemon/gvfsbackendftp.c:2345
+#: ../daemon/gvfsbackendftp.c:2508
msgid "Invalid destination filename"
msgstr "Неверное имя файла назначения"
-#: ../daemon/gvfsbackendgphoto2.c:501
+#: ../daemon/gvfsbackendgphoto2.c:492
#, c-format
msgid "%s: %d: Directory or file exists"
msgstr "%s: %d: файл или каталог не существует"
-#: ../daemon/gvfsbackendgphoto2.c:508
+#: ../daemon/gvfsbackendgphoto2.c:499
#, c-format
msgid "%s: %d: No such file or directory"
msgstr "%s: %d: нет такого файла или каталога"
-#: ../daemon/gvfsbackendgphoto2.c:514
+#: ../daemon/gvfsbackendgphoto2.c:505
#, c-format
msgid "%s: %d: Invalid filename"
msgstr "%s: %d: неверное имя файла"
-#: ../daemon/gvfsbackendgphoto2.c:520
+#: ../daemon/gvfsbackendgphoto2.c:511
#, c-format
msgid "%s: %d: Not Supported"
msgstr "%s: %d: не поддерживается"
#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:693
+#: ../daemon/gvfsbackendgphoto2.c:684
#, c-format
msgid "Digital Camera (%s)"
msgstr "Цифровая камера (%s)"
#. Translator: %s is the vendor name, e.g. Panasonic
#. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:841 ../monitor/gphoto2/ggphoto2volume.c:183
+#: ../daemon/gvfsbackendgphoto2.c:832 ../monitor/gphoto2/ggphoto2volume.c:179
#, c-format
msgid "%s Camera"
msgstr "Камера %s"
#. Translator: %s is the vendor name, e.g. Panasonic
#. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:844 ../monitor/gphoto2/ggphoto2volume.c:178
+#: ../daemon/gvfsbackendgphoto2.c:835 ../monitor/gphoto2/ggphoto2volume.c:174
#, c-format
msgid "%s Audio Player"
msgstr "Звуковой проигрыватель %s"
-#: ../daemon/gvfsbackendgphoto2.c:853 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:844 ../monitor/gphoto2/ggphoto2volume.c:188
msgid "Camera"
msgstr "Камера"
-#: ../daemon/gvfsbackendgphoto2.c:855 ../monitor/gphoto2/ggphoto2volume.c:190
+#: ../daemon/gvfsbackendgphoto2.c:846 ../monitor/gphoto2/ggphoto2volume.c:186
msgid "Audio Player"
msgstr "Звуковой проигрыватель"
-#: ../daemon/gvfsbackendgphoto2.c:1325 ../daemon/gvfsbackendgphoto2.c:2014
-msgid "Failed to get folder list"
-msgstr "Не удалось получить список каталогов"
-
-#: ../daemon/gvfsbackendgphoto2.c:1443
+#: ../daemon/gvfsbackendgphoto2.c:1429
msgid "No device specified"
msgstr "Устройство не указано"
-#: ../daemon/gvfsbackendgphoto2.c:1460
+#: ../daemon/gvfsbackendgphoto2.c:1446
msgid "Cannot create gphoto2 context"
msgstr "Не удалось создать контекст gphoto2"
-#: ../daemon/gvfsbackendgphoto2.c:1470
+#: ../daemon/gvfsbackendgphoto2.c:1456
msgid "Error creating camera"
msgstr "Ошибка при создании объекта камеры"
-#: ../daemon/gvfsbackendgphoto2.c:1483 ../daemon/gvfsbackendgphoto2.c:1493
+#: ../daemon/gvfsbackendgphoto2.c:1469 ../daemon/gvfsbackendgphoto2.c:1479
msgid "Error loading device information"
msgstr "Ошибка при загрузке информации об устройстве"
-#: ../daemon/gvfsbackendgphoto2.c:1505
+#: ../daemon/gvfsbackendgphoto2.c:1491
msgid "Error looking up device information"
msgstr "Не удалось найти информацию об устройстве"
-#: ../daemon/gvfsbackendgphoto2.c:1515
+#: ../daemon/gvfsbackendgphoto2.c:1501
msgid "Error getting device information"
msgstr "Ошибка при получении информации об устройстве"
-#: ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendgphoto2.c:1514
msgid "Error setting up camera communications port"
msgstr "Ошибка при установке порта для связи с камерой"
-#: ../daemon/gvfsbackendgphoto2.c:1539
+#: ../daemon/gvfsbackendgphoto2.c:1525
msgid "Error initializing camera"
msgstr "Ошибка при инициализации камеры"
#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendgphoto2.c:1539
#, c-format
msgid "gphoto2 mount on %s"
msgstr "подключение gphoto2 на %s"
-#: ../daemon/gvfsbackendgphoto2.c:1628
+#: ../daemon/gvfsbackendgphoto2.c:1614
msgid "No camera specified"
msgstr "Камера не определена"
-#: ../daemon/gvfsbackendgphoto2.c:1721
+#: ../daemon/gvfsbackendgphoto2.c:1706
msgid "Error creating file object"
msgstr "Ошибка при создания объекта файла"
-#: ../daemon/gvfsbackendgphoto2.c:1736
+#: ../daemon/gvfsbackendgphoto2.c:1721
msgid "Error getting file"
msgstr "Ошибка при получении файла"
-#: ../daemon/gvfsbackendgphoto2.c:1746
+#: ../daemon/gvfsbackendgphoto2.c:1731
msgid "Error getting data from file"
msgstr "Ошибка при получении данных из файла"
-#: ../daemon/gvfsbackendgphoto2.c:1841 ../daemon/gvfsbackendgphoto2.c:3030
+#: ../daemon/gvfsbackendgphoto2.c:1788
+#, c-format
+msgid "Malformed icon identifier '%s'"
+msgstr "Некорректный идентификатор значка «%s»"
+
+#: ../daemon/gvfsbackendgphoto2.c:1864 ../daemon/gvfsbackendgphoto2.c:3053
#, c-format
msgid "Error seeking in stream on camera %s"
msgstr "Ошибка поиска в потоке, созданном камерой %s"
-#: ../daemon/gvfsbackendgphoto2.c:1981 ../daemon/gvfsbackendsmbbrowse.c:1112
+#: ../daemon/gvfsbackendgphoto2.c:2004 ../daemon/gvfsbackendsmbbrowse.c:1388
msgid "Not a directory"
msgstr "Не является каталогом"
-#: ../daemon/gvfsbackendgphoto2.c:2080
+#: ../daemon/gvfsbackendgphoto2.c:2037
+msgid "Failed to get folder list"
+msgstr "Не удалось получить список каталогов"
+
+#: ../daemon/gvfsbackendgphoto2.c:2103
msgid "Failed to get file list"
msgstr "Не удалось получить список файлов"
-#: ../daemon/gvfsbackendgphoto2.c:2372
+#: ../daemon/gvfsbackendgphoto2.c:2395
msgid "Error creating directory"
msgstr "Ошибка создания каталога"
-#: ../daemon/gvfsbackendgphoto2.c:2581
+#: ../daemon/gvfsbackendgphoto2.c:2604
msgid "Name already exists"
msgstr "Такое имя уже существует"
-#: ../daemon/gvfsbackendgphoto2.c:2592 ../daemon/gvfsbackendgphoto2.c:3221
+#: ../daemon/gvfsbackendgphoto2.c:2615 ../daemon/gvfsbackendgphoto2.c:3244
msgid "New name too long"
msgstr "Слишком длинное имя"
-#: ../daemon/gvfsbackendgphoto2.c:2602 ../daemon/gvfsbackendgphoto2.c:3232
+#: ../daemon/gvfsbackendgphoto2.c:2625 ../daemon/gvfsbackendgphoto2.c:3255
msgid "Error renaming dir"
msgstr "Ошибка при переименовании каталога"
-#: ../daemon/gvfsbackendgphoto2.c:2615 ../daemon/gvfsbackendgphoto2.c:3245
+#: ../daemon/gvfsbackendgphoto2.c:2638 ../daemon/gvfsbackendgphoto2.c:3268
msgid "Error renaming file"
msgstr "Ошибка при переименовании файла"
-#: ../daemon/gvfsbackendgphoto2.c:2679
+#: ../daemon/gvfsbackendgphoto2.c:2702
#, c-format
msgid "Directory '%s' is not empty"
msgstr "Каталог «%s» не пустой"
-#: ../daemon/gvfsbackendgphoto2.c:2690
+#: ../daemon/gvfsbackendgphoto2.c:2713
msgid "Error deleting directory"
msgstr "Ошибка при удалении каталога"
-#: ../daemon/gvfsbackendgphoto2.c:2716
+#: ../daemon/gvfsbackendgphoto2.c:2739
msgid "Error deleting file"
msgstr "Ошибка при удалении файла"
-#: ../daemon/gvfsbackendgphoto2.c:2769
+#: ../daemon/gvfsbackendgphoto2.c:2792
msgid "Can't write to directory"
msgstr "Не удаётся произвести запись в каталог"
-#: ../daemon/gvfsbackendgphoto2.c:2816
+#: ../daemon/gvfsbackendgphoto2.c:2839
msgid "Cannot allocate new file to append to"
msgstr "не удалось выделить новый файл для добавления в конец"
-#: ../daemon/gvfsbackendgphoto2.c:2831
+#: ../daemon/gvfsbackendgphoto2.c:2854
msgid "Cannot read file to append to"
msgstr "Не удалось прочитать файл для добавления в конец"
-#: ../daemon/gvfsbackendgphoto2.c:2842
+#: ../daemon/gvfsbackendgphoto2.c:2865
msgid "Cannot get data of file to append to"
msgstr "Не удалось получить данные файла для добавления в конец"
-#: ../daemon/gvfsbackendgphoto2.c:3129
+#: ../daemon/gvfsbackendgphoto2.c:3152
msgid "Error writing file"
msgstr "Ошибка записи в файл"
-#: ../daemon/gvfsbackendgphoto2.c:3177
+#: ../daemon/gvfsbackendgphoto2.c:3200
msgid "Not supported (not same directory)"
msgstr "Не поддерживается (не тот же самый каталог)"
-#: ../daemon/gvfsbackendgphoto2.c:3189
+#: ../daemon/gvfsbackendgphoto2.c:3212
msgid "Not supported (src is dir, dst is dir)"
msgstr "Не поддерживается (источник - каталог, назначение - каталог)"
-#: ../daemon/gvfsbackendgphoto2.c:3197
+#: ../daemon/gvfsbackendgphoto2.c:3220
msgid "Not supported (src is dir, dst is existing file)"
-msgstr ""
-"Не поддерживается (источник - каталог, назначение - существующий файл)"
+msgstr "Не поддерживается (источник - каталог, назначение - существующий файл)"
-#: ../daemon/gvfsbackendgphoto2.c:3209
+#: ../daemon/gvfsbackendgphoto2.c:3232
msgid "Not supported (src is file, dst is dir)"
msgstr "Не поддерживается (источник - файл, назначение - каталог)"
-#: ../daemon/gvfsbackendhttp.c:241
+#: ../daemon/gvfsbackendhttp.c:248
#, c-format
msgid "HTTP Client Error: %s"
msgstr "Ошибка клиента HTTP: %s"
-#: ../daemon/gvfsbackendhttp.c:560 ../daemon/gvfsbackendsftp.c:1882
-#: ../daemon/gvfsbackendsmb.c:1319 ../daemon/gvfsbackendtrash.c:1006
-#: ../daemon/gvfsdaemonutils.c:211
+#: ../daemon/gvfsbackendhttp.c:570 ../daemon/gvfsbackendsftp.c:1910
+#: ../daemon/gvfsbackendsmb.c:1399 ../daemon/gvfsdaemonutils.c:211
msgid " (invalid encoding)"
msgstr " (неверная кодировка)"
@@ -815,18 +900,13 @@ msgid "Directory notification not supported"
msgstr "Уведомление для каталогов не поддерживается"
#. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:268 ../daemon/gvfsbackendsmbbrowse.c:699
+#: ../daemon/gvfsbackendnetwork.c:269 ../daemon/gvfsbackendsmbbrowse.c:885
msgid "Windows Network"
msgstr "Сеть Windows"
-#. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackendnetwork.c:392
-msgid "Local Network"
-msgstr "Локальная сеть"
-
#. Translators: this is the friendly name of the 'network://' backend that
#. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:862
+#: ../daemon/gvfsbackendnetwork.c:931
msgid "Network Location Monitor"
msgstr "Обзор сети"
@@ -836,74 +916,80 @@ msgstr "Обзор сети"
#. lead to G_IO_ERROR_NOT_MOUNTED errors
#.
#. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendobexftp.c:442 ../daemon/gvfsbackendsmb.c:528
-#: ../daemon/gvfsbackendsmb.c:1312
+#: ../daemon/gvfsbackendobexftp.c:656 ../daemon/gvfsbackendsmb.c:545
+#: ../daemon/gvfsbackendsmb.c:1392
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: ../daemon/gvfsbackendobexftp.c:699
+#: ../daemon/gvfsbackendobexftp.c:865
+msgid "USB support missing. Please contact your software vendor"
+msgstr ""
+"Не найдена поддержка USB. Свяжитесь с вашим поставщиком программного "
+"обеспечения"
+
+#: ../daemon/gvfsbackendobexftp.c:985
msgid "Connection to the device lost"
msgstr "Соединение с устройством потеряно"
-#: ../daemon/gvfsbackendobexftp.c:1194
+#: ../daemon/gvfsbackendobexftp.c:1482
msgid "Device requires a software update"
msgstr "Устройство требует обновления программного обеспечения"
-#: ../daemon/gvfsbackendsftp.c:281
+#: ../daemon/gvfsbackendsftp.c:291 ../daemon/gvfsbackendsftp.c:569
msgid "ssh program unexpectedly exited"
msgstr "Программа ssh неожиданно завершилась"
-#: ../daemon/gvfsbackendsftp.c:296
+#: ../daemon/gvfsbackendsftp.c:306
msgid "Hostname not known"
msgstr "Имя узла неизвестно"
-#: ../daemon/gvfsbackendsftp.c:303
+#: ../daemon/gvfsbackendsftp.c:313
msgid "No route to host"
msgstr "Нет маршрута к узлу"
-#: ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:320
msgid "Connection refused by server"
msgstr "Соединение отклонено сервером"
-#: ../daemon/gvfsbackendsftp.c:317
+#: ../daemon/gvfsbackendsftp.c:327
msgid "Host key verification failed"
msgstr "Сбой проверки сертификата узла"
-#: ../daemon/gvfsbackendsftp.c:400
+#: ../daemon/gvfsbackendsftp.c:413
msgid "Unable to spawn ssh program"
msgstr "Не удаётся выполнить программу ssh"
-#: ../daemon/gvfsbackendsftp.c:416
+#: ../daemon/gvfsbackendsftp.c:429
#, c-format
msgid "Unable to spawn ssh program: %s"
msgstr "Не удаётся выполнить программу ssh: %s"
-#: ../daemon/gvfsbackendsftp.c:528 ../daemon/gvfsbackendsftp.c:780
+#: ../daemon/gvfsbackendsftp.c:531 ../daemon/gvfsbackendsftp.c:792
msgid "Timed out when logging in"
msgstr "Время ожидания входа в систему истекло"
-#: ../daemon/gvfsbackendsftp.c:858
+#: ../daemon/gvfsbackendsftp.c:871
msgid "Enter passphrase for key"
msgstr "Введите ключевую разу для ключа"
-#: ../daemon/gvfsbackendsftp.c:860
+#: ../daemon/gvfsbackendsftp.c:873
msgid "Enter password"
msgstr "Введите пароль"
-#: ../daemon/gvfsbackendsftp.c:921
+#: ../daemon/gvfsbackendsftp.c:949
msgid "Can't send password"
msgstr "Не удаётся отправить пароль"
-#: ../daemon/gvfsbackendsftp.c:929
+#: ../daemon/gvfsbackendsftp.c:957
msgid "Log In Anyway"
msgstr "Подключиться всё равно"
-#: ../daemon/gvfsbackendsftp.c:929
+#: ../daemon/gvfsbackendsftp.c:957
msgid "Cancel Login"
msgstr "Отменить подключение"
-#: ../daemon/gvfsbackendsftp.c:939
+#: ../daemon/gvfsbackendsftp.c:967
#, c-format
msgid ""
"The identity of the remote computer (%s) is unknown.\n"
@@ -919,150 +1005,168 @@ msgstr ""
"быть абсолютно уверенным в безопасности подключения к этому компьютеру, "
"обратитесь к системному администратору."
-#: ../daemon/gvfsbackendsftp.c:959
+#: ../daemon/gvfsbackendsftp.c:987
msgid "Login dialog cancelled"
msgstr "Диалог ввода пароля прерван"
-#: ../daemon/gvfsbackendsftp.c:979
+#: ../daemon/gvfsbackendsftp.c:1007
msgid "Can't send host identity confirmation"
msgstr "Не удаётся отправить подтверждение идентификации узла"
-#: ../daemon/gvfsbackendsftp.c:1472 ../daemon/gvfsbackendsftp.c:1495
+#: ../daemon/gvfsbackendsftp.c:1500 ../daemon/gvfsbackendsftp.c:1523
msgid "Protocol error"
msgstr "Ошибка протокола"
+#. Translators: This is the name of an sftp share, like "sftp for <user>on <hostname>"
+#: ../daemon/gvfsbackendsftp.c:1548
+#, c-format
+msgid "sftp for %s on %s"
+msgstr "sftp пользователя %s на %s"
+
#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1519
+#: ../daemon/gvfsbackendsftp.c:1551
#, c-format
msgid "sftp on %s"
msgstr "sftp на %s"
-#: ../daemon/gvfsbackendsftp.c:1543
+#: ../daemon/gvfsbackendsftp.c:1577
msgid "Unable to find supported ssh command"
msgstr "Не удаётся найти поддерживаемую команду ssh"
-#: ../daemon/gvfsbackendsftp.c:1967
+#: ../daemon/gvfsbackendsftp.c:1995
msgid "Failure"
msgstr "Ошибка"
-#: ../daemon/gvfsbackendsftp.c:2023 ../daemon/gvfsbackendsftp.c:2082
-#: ../daemon/gvfsbackendsftp.c:2093 ../daemon/gvfsbackendsftp.c:2149
-#: ../daemon/gvfsbackendsftp.c:2235 ../daemon/gvfsbackendsftp.c:2285
-#: ../daemon/gvfsbackendsftp.c:2331 ../daemon/gvfsbackendsftp.c:2406
-#: ../daemon/gvfsbackendsftp.c:2513 ../daemon/gvfsbackendsftp.c:2553
-#: ../daemon/gvfsbackendsftp.c:2603 ../daemon/gvfsbackendsftp.c:2672
-#: ../daemon/gvfsbackendsftp.c:2692 ../daemon/gvfsbackendsftp.c:2844
-#: ../daemon/gvfsbackendsftp.c:2869 ../daemon/gvfsbackendsftp.c:2924
-#: ../daemon/gvfsbackendsftp.c:2981 ../daemon/gvfsbackendsftp.c:3252
-#: ../daemon/gvfsbackendsftp.c:3319 ../daemon/gvfsbackendsftp.c:3448
-#: ../daemon/gvfsbackendsftp.c:3483 ../daemon/gvfsbackendsftp.c:3511
-#: ../daemon/gvfsbackendsftp.c:3619 ../daemon/gvfsbackendsftp.c:3673
-#: ../daemon/gvfsbackendsftp.c:3707 ../daemon/gvfsbackendsftp.c:3741
-#: ../daemon/gvfsbackendsftp.c:3756 ../daemon/gvfsbackendsftp.c:3771
-#: ../daemon/gvfsbackendsftp.c:3849
+#: ../daemon/gvfsbackendsftp.c:2051 ../daemon/gvfsbackendsftp.c:2130
+#: ../daemon/gvfsbackendsftp.c:2141 ../daemon/gvfsbackendsftp.c:2197
+#: ../daemon/gvfsbackendsftp.c:2283 ../daemon/gvfsbackendsftp.c:2333
+#: ../daemon/gvfsbackendsftp.c:2379 ../daemon/gvfsbackendsftp.c:2454
+#: ../daemon/gvfsbackendsftp.c:2561 ../daemon/gvfsbackendsftp.c:2601
+#: ../daemon/gvfsbackendsftp.c:2651 ../daemon/gvfsbackendsftp.c:2723
+#: ../daemon/gvfsbackendsftp.c:2735 ../daemon/gvfsbackendsftp.c:2793
+#: ../daemon/gvfsbackendsftp.c:2835 ../daemon/gvfsbackendsftp.c:3012
+#: ../daemon/gvfsbackendsftp.c:3037 ../daemon/gvfsbackendsftp.c:3092
+#: ../daemon/gvfsbackendsftp.c:3149 ../daemon/gvfsbackendsftp.c:3420
+#: ../daemon/gvfsbackendsftp.c:3487 ../daemon/gvfsbackendsftp.c:3622
+#: ../daemon/gvfsbackendsftp.c:3682 ../daemon/gvfsbackendsftp.c:3717
+#: ../daemon/gvfsbackendsftp.c:3745 ../daemon/gvfsbackendsftp.c:3853
+#: ../daemon/gvfsbackendsftp.c:3907 ../daemon/gvfsbackendsftp.c:3943
+#: ../daemon/gvfsbackendsftp.c:3977 ../daemon/gvfsbackendsftp.c:3992
+#: ../daemon/gvfsbackendsftp.c:4007 ../daemon/gvfsbackendsftp.c:4085
msgid "Invalid reply received"
msgstr "Получен неверный ответ"
-#: ../daemon/gvfsbackendsftp.c:2351
+#: ../daemon/gvfsbackendsftp.c:2103
+#, c-format
+msgid "Invalid icon_id '%s' in OpenIconForRead"
+msgstr "Некорректный icon_id «%s» в OpenIconForRead"
+
+#: ../daemon/gvfsbackendsftp.c:2399
#, c-format
msgid "Error creating backup file: %s"
msgstr "Ошибка создания резервной копии файла: %s"
-#: ../daemon/gvfsbackendsftp.c:2754
+#: ../daemon/gvfsbackendsftp.c:2897
msgid "Unable to create temporary file"
msgstr "Не удаётся создать временный файл"
-#: ../daemon/gvfsbackendsftp.c:3545 ../daemon/gvfsbackendsmb.c:1811
+#: ../daemon/gvfsbackendsftp.c:3779 ../daemon/gvfsbackendsmb.c:1963
msgid "Can't move directory over directory"
msgstr "Не удаётся переместить каталог поверх каталога"
#. translators: First %s is a share name, second is a server name
-#: ../daemon/gvfsbackendsmb.c:213
+#: ../daemon/gvfsbackendsmb.c:229
#, c-format
msgid "Password required for share %s on %s"
msgstr "Требуется пароль для ресурса %s на %s"
-#: ../daemon/gvfsbackendsmb.c:468 ../daemon/gvfsbackendsmb.c:514
+#: ../daemon/gvfsbackendsmb.c:485 ../daemon/gvfsbackendsmb.c:531
#: ../daemon/gvfsdaemonutils.c:92
#, c-format
msgid "Internal Error (%s)"
msgstr "Внутренняя ошибка (%s)"
#. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmb.c:587
+#: ../daemon/gvfsbackendsmb.c:611
msgid "Failed to mount Windows share"
msgstr "Ошибка подключения ресурса Windows"
-#: ../daemon/gvfsbackendsmb.c:735 ../daemon/gvfsbackendsmb.c:1191
+#: ../daemon/gvfsbackendsmb.c:760 ../daemon/gvfsbackendsmb.c:1243
msgid "Unsupported seek type"
msgstr "Неподдерживаемый тип поиска"
-#: ../daemon/gvfsbackendsmb.c:1255
+#: ../daemon/gvfsbackendsmb.c:1335
#, c-format
msgid "Backup file creation failed: %s"
msgstr "Ошибка создания резервного файла: %s"
-#: ../daemon/gvfsbackendsmb.c:1713
+#: ../daemon/gvfsbackendsmb.c:1865
#, c-format
msgid "Error deleting file: %s"
msgstr "Ошибка удаления файла: %s"
-#: ../daemon/gvfsbackendsmb.c:1787
+#: ../daemon/gvfsbackendsmb.c:1939
#, c-format
msgid "Error moving file: %s"
msgstr "Ошибка перемещения файла: %s"
-#: ../daemon/gvfsbackendsmb.c:1859
+#: ../daemon/gvfsbackendsmb.c:2011
#, c-format
msgid "Error removing target file: %s"
msgstr "Ошибка удаления файла назначения: %s"
-#: ../daemon/gvfsbackendsmb.c:1883
+#: ../daemon/gvfsbackendsmb.c:2035
msgid "Can't recursively move directory"
msgstr "Не удаётся переместить каталог рекурсивно"
-#: ../daemon/gvfsbackendsmb.c:1946
+#: ../daemon/gvfsbackendsmb.c:2101
msgid "Windows Shares Filesystem Service"
msgstr "Служба файловой системы ресурсов Windows"
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:365
+#, c-format
+msgid "Password required for %s"
+msgstr "Требуется пароль для ресурса %s"
+
#. translators: Name for the location that lists the smb shares
#. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:707
+#: ../daemon/gvfsbackendsmbbrowse.c:893
#, c-format
msgid "Windows shares on %s"
msgstr "Ресурсы Windows на %s"
-#: ../daemon/gvfsbackendsmbbrowse.c:799 ../daemon/gvfsbackendsmbbrowse.c:845
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:992
+msgid "Failed to retrieve share list from server"
+msgstr "Не удалось получить список доступных на сервере ресурсов"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1080 ../daemon/gvfsbackendsmbbrowse.c:1126
msgid "The file is not a mountable"
msgstr "Этот файл не является монтируемым"
-#: ../daemon/gvfsbackendsmbbrowse.c:867
+#: ../daemon/gvfsbackendsmbbrowse.c:1148
msgid "Not a regular file"
msgstr "Не является обычным файлом"
-#: ../daemon/gvfsbackendsmbbrowse.c:1224
+#: ../daemon/gvfsbackendsmbbrowse.c:1501
msgid "Windows Network Filesystem Service"
msgstr "Служба сетевой файловой системы Windows"
-#. translators: This is the name of the backend
+#: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
+msgid "The trash folder may not be deleted"
+msgstr "Папка корзины не может быть удалена"
+
+#: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
+msgid "Items in the trash may not be modified"
+msgstr "Элементы в корзине не могут быть изменены"
+
#. Translators: this is the display name of the backend
-#: ../daemon/gvfsbackendtrash.c:641 ../daemon/gvfsbackendtrash.c:1229
+#. translators: This is the name of the backend
+#: ../daemon/gvfsbackendtrash.c:735 ../daemon/gvfsbackendtrash.c:843
msgid "Trash"
msgstr "Корзина"
-#: ../daemon/gvfsbackendtrash.c:1019
-#, c-format
-msgid "%s (in trash)"
-msgstr "%s (в корзине)"
-
-#: ../daemon/gvfsbackendtrash.c:1330
-msgid "Can't delete trash"
-msgstr "Не удаётся удалить корзину"
-
-#: ../daemon/gvfsbackendtrash.c:1677 ../daemon/gvfsbackendtrash.c:1752
-msgid "Trash directory notification not supported"
-msgstr "Уведомление не поддерживается для каталога корзины"
-
#: ../daemon/gvfsdaemon.c:1032
msgid "Invalid backend type"
msgstr "Неверный тип драйвера"
@@ -1104,360 +1208,360 @@ msgid "%s: %s"
msgstr "%s: %s"
#: ../daemon/main.c:78 ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
-#: ../programs/gvfs-copy.c:101 ../programs/gvfs-info.c:337
+#: ../programs/gvfs-copy.c:101 ../programs/gvfs-info.c:364
#: ../programs/gvfs-ls.c:386 ../programs/gvfs-mkdir.c:59
-#: ../programs/gvfs-move.c:97 ../programs/gvfs-open.c:131
-#: ../programs/gvfs-open.c:144 ../programs/gvfs-save.c:165
+#: ../programs/gvfs-move.c:97 ../programs/gvfs-open.c:140
+#: ../programs/gvfs-open.c:153 ../programs/gvfs-save.c:165
#: ../programs/gvfs-tree.c:251
#, c-format
msgid "Try \"%s --help\" for more information."
msgstr ""
"Для получения дополнительной информации используйте команду \"%s --help\""
-#: ../daemon/mount.c:439
+#: ../daemon/mount.c:456
msgid "Invalid arguments from spawned child"
msgstr "Неверные аргументы от порождённого дочернего процесса"
-#: ../daemon/mount.c:740
+#: ../daemon/mount.c:767
#, c-format
msgid "Automount failed: %s"
msgstr "Сбой автомонтирования: %s"
-#: ../daemon/mount.c:785
+#: ../daemon/mount.c:812 ../daemon/mount.c:886
msgid "The specified location is not mounted"
msgstr "Указанный адрес не смонтирован"
-#: ../daemon/mount.c:790
+#: ../daemon/mount.c:817
msgid "The specified location is not supported"
msgstr "Указанный адрес не поддерживается"
-#: ../daemon/mount.c:954
+#: ../daemon/mount.c:1023
msgid "Location is already mounted"
msgstr "Адрес уже смонтирован"
-#: ../daemon/mount.c:962
+#: ../daemon/mount.c:1031
msgid "Location is not mountable"
msgstr "Адрес не является монтируемым"
-#: ../monitor/hal/ghaldrive.c:130
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
+msgid "CD-ROM Disc"
+msgstr "Диск CD-ROM"
+
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
+msgid "Blank CD-ROM Disc"
+msgstr "Чистый диск CD-ROM"
+
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
+msgid "CD-R Disc"
+msgstr "Диск CD-R"
+
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
+msgid "Blank CD-R Disc"
+msgstr "Чистый диск CD-R"
+
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
+msgid "CD-RW Disc"
+msgstr "Диск CD-RW"
+
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
+msgid "Blank CD-RW Disc"
+msgstr "Чистый диск CD-RW"
+
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
+msgid "DVD-ROM Disc"
+msgstr "Диск DVD-ROM"
+
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
+msgid "Blank DVD-ROM Disc"
+msgstr "Чистый диск DVD-ROM"
+
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
+msgid "DVD-RAM Disc"
+msgstr "Диск DVD-RAM"
+
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
+msgid "Blank DVD-RAM Disc"
+msgstr "Чистый диск DVD-RAM"
+
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
+msgid "DVD-RW Disc"
+msgstr "Диск DVD-RW"
+
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
+msgid "Blank DVD-RW Disc"
+msgstr "Чистый диск DVD-RW"
+
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
+msgid "DVD+R Disc"
+msgstr "Диск DVD+R"
+
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
+msgid "Blank DVD+R Disc"
+msgstr "Чистый диск DVD+R"
+
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
+msgid "DVD+RW Disc"
+msgstr "Диск DVD+RW"
+
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
+msgid "Blank DVD+RW Disc"
+msgstr "Чистый диск DVD+RW"
+
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
+msgid "DVD+R DL Disc"
+msgstr "Диск DVD+R DL"
+
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
+msgid "Blank DVD+R DL Disc"
+msgstr "Чистый диск DVD+R DL"
+
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
+msgid "Blu-Ray Disc"
+msgstr "Диск Blu-Ray"
+
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
+msgid "Blank Blu-Ray Disc"
+msgstr "Чистый диск Blu-Ray"
+
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
+msgid "Blu-Ray R Disc"
+msgstr "Диск Blu-Ray R"
+
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
+msgid "Blank Blu-Ray R Disc"
+msgstr "Чистый диск Blu-Ray R"
+
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
+msgid "Blu-Ray RW Disc"
+msgstr "Диск Blu-Ray RW"
+
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
+msgid "Blank Blu-Ray RW Disc"
+msgstr "Чистый диск Blu-Ray RW"
+
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
+msgid "HD DVD Disc"
+msgstr "Диск HD DVD"
+
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
+msgid "Blank HD DVD Disc"
+msgstr "Чистый диск HD DVD"
+
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
+msgid "HD DVD-R Disc"
+msgstr "Диск HD DVD-R"
+
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
+msgid "Blank HD DVD-R Disc"
+msgstr "Чистый диск HD DVD-R"
+
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
+msgid "HD DVD-RW Disc"
+msgstr "Диск HD DVD-RW"
+
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
+msgid "Blank HD DVD-RW Disc"
+msgstr "Чистый диск HD DVD-RW"
+
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
+msgid "MO Disc"
+msgstr "МО диск"
+
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
+msgid "Blank MO Disc"
+msgstr "Чистый МО диск"
+
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
+msgid "Disc"
+msgstr "Диск"
+
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
+msgid "Blank Disc"
+msgstr "Чистый диск"
+
+#: ../monitor/hal/ghaldrive.c:127
msgid "CD-ROM"
msgstr "CD-ROM"
-#: ../monitor/hal/ghaldrive.c:132
+#: ../monitor/hal/ghaldrive.c:129
msgid "CD-R"
msgstr "CD-R"
-#: ../monitor/hal/ghaldrive.c:134
+#: ../monitor/hal/ghaldrive.c:131
msgid "CD-RW"
msgstr "CD-RW"
-#: ../monitor/hal/ghaldrive.c:138
+#: ../monitor/hal/ghaldrive.c:135
msgid "DVD-ROM"
msgstr "DVD-ROM"
-#: ../monitor/hal/ghaldrive.c:140
+#: ../monitor/hal/ghaldrive.c:137
msgid "DVD+R"
msgstr "DVD+R"
-#: ../monitor/hal/ghaldrive.c:142
+#: ../monitor/hal/ghaldrive.c:139
msgid "DVD+RW"
msgstr "DVD+RW"
-#: ../monitor/hal/ghaldrive.c:144
+#: ../monitor/hal/ghaldrive.c:141
msgid "DVD-R"
msgstr "DVD-R"
-#: ../monitor/hal/ghaldrive.c:146
+#: ../monitor/hal/ghaldrive.c:143
msgid "DVD-RW"
msgstr "DVD-RW"
-#: ../monitor/hal/ghaldrive.c:148
+#: ../monitor/hal/ghaldrive.c:145
msgid "DVD-RAM"
msgstr "DVD-RAM"
-#: ../monitor/hal/ghaldrive.c:151
+#: ../monitor/hal/ghaldrive.c:148
msgid "DVD±R"
msgstr "DVD±R"
-#: ../monitor/hal/ghaldrive.c:154
+#: ../monitor/hal/ghaldrive.c:151
msgid "DVD±RW"
msgstr "DVD±RW"
-#: ../monitor/hal/ghaldrive.c:156
+#: ../monitor/hal/ghaldrive.c:153
msgid "HDDVD"
msgstr "HDDVD"
-#: ../monitor/hal/ghaldrive.c:158
+#: ../monitor/hal/ghaldrive.c:155
msgid "HDDVD-r"
msgstr "HDDVD-r"
-#: ../monitor/hal/ghaldrive.c:160
+#: ../monitor/hal/ghaldrive.c:157
msgid "HDDVD-RW"
msgstr "HDDVD-RW"
-#: ../monitor/hal/ghaldrive.c:162
+#: ../monitor/hal/ghaldrive.c:159
msgid "Blu-ray"
msgstr "Blu-ray"
-#: ../monitor/hal/ghaldrive.c:164
+#: ../monitor/hal/ghaldrive.c:161
msgid "Blu-ray-R"
msgstr "Blu-ray-R"
-#: ../monitor/hal/ghaldrive.c:166
+#: ../monitor/hal/ghaldrive.c:163
msgid "Blu-ray-RE"
msgstr "Blu-ray-RE"
#. translators: This wis something like "CD-ROM/DVD Drive" or
#. "CD-RW/Blue-ray Drive" depending on the properties of the drive
-#: ../monitor/hal/ghaldrive.c:172
+#: ../monitor/hal/ghaldrive.c:169
#, c-format
msgid "%s/%s Drive"
msgstr "Устройство %s/%s"
#. translators: This wis something like "CD-ROM Drive" or "CD-RW Drive
#. depending on the properties of the drive
-#: ../monitor/hal/ghaldrive.c:178
+#: ../monitor/hal/ghaldrive.c:175
#, c-format
msgid "%s Drive"
msgstr "Устройство %s"
-#: ../monitor/hal/ghaldrive.c:182
+#: ../monitor/hal/ghaldrive.c:179
msgid "Floppy Drive"
msgstr "Флоппи-дисковод"
-#: ../monitor/hal/ghaldrive.c:188
+#: ../monitor/hal/ghaldrive.c:185
msgid "Software RAID Drive"
msgstr "Устройство программного RAID"
-#: ../monitor/hal/ghaldrive.c:190
+#: ../monitor/hal/ghaldrive.c:187
msgid "USB Drive"
msgstr "Устройство USB"
-#: ../monitor/hal/ghaldrive.c:192
+#: ../monitor/hal/ghaldrive.c:189
msgid "ATA Drive"
msgstr "Устройство ATA"
-#: ../monitor/hal/ghaldrive.c:194
+#: ../monitor/hal/ghaldrive.c:191
msgid "SCSI Drive"
msgstr "Устройство SCSI"
-#: ../monitor/hal/ghaldrive.c:196
+#: ../monitor/hal/ghaldrive.c:193
msgid "FireWire Drive"
msgstr "Устройство FireWire"
-#: ../monitor/hal/ghaldrive.c:200
+#: ../monitor/hal/ghaldrive.c:197
msgid "Tape Drive"
msgstr "Ленточный накопитель"
-#: ../monitor/hal/ghaldrive.c:202
+#: ../monitor/hal/ghaldrive.c:199
msgid "CompactFlash Drive"
msgstr "Устройство CompactFlash"
-#: ../monitor/hal/ghaldrive.c:204
+#: ../monitor/hal/ghaldrive.c:201
msgid "MemoryStick Drive"
msgstr "Устройство MemoryStick"
-#: ../monitor/hal/ghaldrive.c:206
+#: ../monitor/hal/ghaldrive.c:203
msgid "SmartMedia Drive"
msgstr "Устройство SmartMedia"
-#: ../monitor/hal/ghaldrive.c:208
+#: ../monitor/hal/ghaldrive.c:205
msgid "SD/MMC Drive"
msgstr "Устройство SD/MMC"
-#: ../monitor/hal/ghaldrive.c:210
+#: ../monitor/hal/ghaldrive.c:207
msgid "Zip Drive"
msgstr "Дисковод Zip"
-#: ../monitor/hal/ghaldrive.c:212
+#: ../monitor/hal/ghaldrive.c:209
msgid "Jaz Drive"
msgstr "Дисковод Jaz"
-#: ../monitor/hal/ghaldrive.c:214
+#: ../monitor/hal/ghaldrive.c:211
msgid "Thumb Drive"
msgstr "USB Flash брелок"
-#: ../monitor/hal/ghaldrive.c:217
+#: ../monitor/hal/ghaldrive.c:214
msgid "Mass Storage Drive"
msgstr "Запоминающее устройство"
-#: ../monitor/hal/ghaldrive.c:723
+#: ../monitor/hal/ghaldrive.c:662
#, c-format
msgid "Failed to eject media; one or more volumes on the media are busy."
msgstr ""
"Не удаётся извлечь диск, потому что один или несколько томов этого диска "
"заняты."
-#: ../monitor/hal/ghalmount.c:301 ../monitor/hal/ghalvolume.c:171
+#: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
#, c-format
msgid "%.1f kB"
msgstr "%.1f КБ"
-#: ../monitor/hal/ghalmount.c:306 ../monitor/hal/ghalvolume.c:176
+#: ../monitor/hal/ghalmount.c:164 ../monitor/hal/ghalvolume.c:168
#, c-format
msgid "%.1f MB"
msgstr "%.1f МБ"
-#: ../monitor/hal/ghalmount.c:311 ../monitor/hal/ghalvolume.c:181
+#: ../monitor/hal/ghalmount.c:169 ../monitor/hal/ghalvolume.c:173
#, c-format
msgid "%.1f GB"
msgstr "%.1f ГБ"
-#: ../monitor/hal/ghalmount.c:433 ../monitor/hal/ghalvolume.c:252
+#: ../monitor/hal/ghalmount.c:323 ../monitor/hal/ghalvolume.c:244
msgid "Mixed Audio/Data Disc"
msgstr "Смешанный диск звук/данные"
#. Translators: %s is the size of the mount (e.g. 512 MB)
#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalmount.c:446 ../monitor/hal/ghalvolume.c:263
+#: ../monitor/hal/ghalmount.c:336 ../monitor/hal/ghalvolume.c:255
#, c-format
msgid "%s Media"
msgstr "Диск %s"
#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalvolume.c:240
+#: ../monitor/hal/ghalvolume.c:232
#, c-format
msgid "%s Encrypted Data"
msgstr "Зашифрованные данные %s"
-#: ../monitor/hal/hal-utils.c:40 ../monitor/gphoto2/hal-utils.c:40
-msgid "CD-ROM Disc"
-msgstr "Диск CD-ROM"
-
-#: ../monitor/hal/hal-utils.c:40 ../monitor/gphoto2/hal-utils.c:40
-msgid "Blank CD-ROM Disc"
-msgstr "Чистый диск CD-ROM"
-
-#: ../monitor/hal/hal-utils.c:41 ../monitor/gphoto2/hal-utils.c:41
-msgid "CD-R Disc"
-msgstr "Диск CD-R"
-
-#: ../monitor/hal/hal-utils.c:41 ../monitor/gphoto2/hal-utils.c:41
-msgid "Blank CD-R Disc"
-msgstr "Чистый диск CD-R"
-
-#: ../monitor/hal/hal-utils.c:42 ../monitor/gphoto2/hal-utils.c:42
-msgid "CD-RW Disc"
-msgstr "Диск CD-RW"
-
-#: ../monitor/hal/hal-utils.c:42 ../monitor/gphoto2/hal-utils.c:42
-msgid "Blank CD-RW Disc"
-msgstr "Чистый диск CD-RW"
-
-#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
-#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
-msgid "DVD-ROM Disc"
-msgstr "Диск DVD-ROM"
-
-#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
-#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
-msgid "Blank DVD-ROM Disc"
-msgstr "Чистый диск DVD-ROM"
-
-#: ../monitor/hal/hal-utils.c:44 ../monitor/gphoto2/hal-utils.c:44
-msgid "DVD-RAM Disc"
-msgstr "Диск DVD-RAM"
-
-#: ../monitor/hal/hal-utils.c:44 ../monitor/gphoto2/hal-utils.c:44
-msgid "Blank DVD-RAM Disc"
-msgstr "Чистый диск DVD-RAM"
-
-#: ../monitor/hal/hal-utils.c:46 ../monitor/gphoto2/hal-utils.c:46
-msgid "DVD-RW Disc"
-msgstr "Диск DVD-RW"
-
-#: ../monitor/hal/hal-utils.c:46 ../monitor/gphoto2/hal-utils.c:46
-msgid "Blank DVD-RW Disc"
-msgstr "Чистый диск DVD-RW"
-
-#: ../monitor/hal/hal-utils.c:47 ../monitor/gphoto2/hal-utils.c:47
-msgid "DVD+R Disc"
-msgstr "Диск DVD+R"
-
-#: ../monitor/hal/hal-utils.c:47 ../monitor/gphoto2/hal-utils.c:47
-msgid "Blank DVD+R Disc"
-msgstr "Чистый диск DVD+R"
-
-#: ../monitor/hal/hal-utils.c:48 ../monitor/gphoto2/hal-utils.c:48
-msgid "DVD+RW Disc"
-msgstr "Диск DVD+RW"
-
-#: ../monitor/hal/hal-utils.c:48 ../monitor/gphoto2/hal-utils.c:48
-msgid "Blank DVD+RW Disc"
-msgstr "Чистый диск DVD+RW"
-
-#: ../monitor/hal/hal-utils.c:49 ../monitor/gphoto2/hal-utils.c:49
-msgid "DVD+R DL Disc"
-msgstr "Диск DVD+R DL"
-
-#: ../monitor/hal/hal-utils.c:49 ../monitor/gphoto2/hal-utils.c:49
-msgid "Blank DVD+R DL Disc"
-msgstr "Чистый диск DVD+R DL"
-
-#: ../monitor/hal/hal-utils.c:50 ../monitor/gphoto2/hal-utils.c:50
-msgid "Blu-Ray Disc"
-msgstr "Диск Blu-Ray"
-
-#: ../monitor/hal/hal-utils.c:50 ../monitor/gphoto2/hal-utils.c:50
-msgid "Blank Blu-Ray Disc"
-msgstr "Чистый диск Blu-Ray"
-
-#: ../monitor/hal/hal-utils.c:51 ../monitor/gphoto2/hal-utils.c:51
-msgid "Blu-Ray R Disc"
-msgstr "Диск Blu-Ray R"
-
-#: ../monitor/hal/hal-utils.c:51 ../monitor/gphoto2/hal-utils.c:51
-msgid "Blank Blu-Ray R Disc"
-msgstr "Чистый диск Blu-Ray R"
-
-#: ../monitor/hal/hal-utils.c:52 ../monitor/gphoto2/hal-utils.c:52
-msgid "Blu-Ray RW Disc"
-msgstr "Диск Blu-Ray RW"
-
-#: ../monitor/hal/hal-utils.c:52 ../monitor/gphoto2/hal-utils.c:52
-msgid "Blank Blu-Ray RW Disc"
-msgstr "Чистый диск Blu-Ray RW"
-
-#: ../monitor/hal/hal-utils.c:53 ../monitor/gphoto2/hal-utils.c:53
-msgid "HD DVD Disc"
-msgstr "Диск HD DVD"
-
-#: ../monitor/hal/hal-utils.c:53 ../monitor/gphoto2/hal-utils.c:53
-msgid "Blank HD DVD Disc"
-msgstr "Чистый диск HD DVD"
-
-#: ../monitor/hal/hal-utils.c:54 ../monitor/gphoto2/hal-utils.c:54
-msgid "HD DVD-R Disc"
-msgstr "Диск HD DVD-R"
-
-#: ../monitor/hal/hal-utils.c:54 ../monitor/gphoto2/hal-utils.c:54
-msgid "Blank HD DVD-R Disc"
-msgstr "Чистый диск HD DVD-R"
-
-#: ../monitor/hal/hal-utils.c:55 ../monitor/gphoto2/hal-utils.c:55
-msgid "HD DVD-RW Disc"
-msgstr "Диск HD DVD-RW"
-
-#: ../monitor/hal/hal-utils.c:55 ../monitor/gphoto2/hal-utils.c:55
-msgid "Blank HD DVD-RW Disc"
-msgstr "Чистый диск HD DVD-RW"
-
-#: ../monitor/hal/hal-utils.c:56 ../monitor/gphoto2/hal-utils.c:56
-msgid "MO Disc"
-msgstr "МО диск"
-
-#: ../monitor/hal/hal-utils.c:56 ../monitor/gphoto2/hal-utils.c:56
-msgid "Blank MO Disc"
-msgstr "Чистый МО диск"
-
-#: ../monitor/hal/hal-utils.c:57 ../monitor/gphoto2/hal-utils.c:57
-msgid "Disc"
-msgstr "Диск"
-
-#: ../monitor/hal/hal-utils.c:57 ../monitor/gphoto2/hal-utils.c:57
-msgid "Blank Disc"
-msgstr "Чистый диск"
-
#. Translators: the first %s is the program name, the second one
#. is the URI of the file, the third is the error message.
#: ../programs/gvfs-cat.c:57
@@ -1514,32 +1618,32 @@ msgstr ""
#. Translators: the %s is the program name. This error message
#. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:142
+#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:151
#, c-format
msgid "%s: missing locations"
msgstr "%s: не указаны адреса"
#. Translators: the first %s is the program name, the second one
#. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-open.c:56
+#: ../programs/gvfs-open.c:65
#, c-format
msgid "%s: %s: error opening location: %s\n"
msgstr "%s: %s: ошибка открытия адреса: %s\n"
#. Translators: the first %s is the program name, the second one
#. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-open.c:83
+#: ../programs/gvfs-open.c:92
#, c-format
msgid "%s: %s: error launching application: %s\n"
msgstr "%s: %s: ошибка запуска приложения: %s\n"
-#: ../programs/gvfs-open.c:113
+#: ../programs/gvfs-open.c:122
msgid "FILES... - open FILES with registered application."
msgstr "ФАЙЛЫ... - открывает ФАЙЛЫ в зарегистрированном приложении."
#. Translators: this message will appear after the usage string
#. and before the list of options.
-#: ../programs/gvfs-open.c:117
+#: ../programs/gvfs-open.c:126
msgid ""
"Opens the file(s) with the default application registered to handle the type "
"of the file."
@@ -1547,6 +1651,24 @@ msgstr ""
"Открывает файл(ы) в приложении по умолчанию, зарегистрированном для "
"обработки файлов этого типа."
+#~ msgid "The query info operation is not supported"
+#~ msgstr "Операция запроса информации не поддерживается"
+
+#~ msgid "Query info not supported on stream"
+#~ msgstr "Запрос информации не поддерживается потоком"
+
+#~ msgid "dns-sd"
+#~ msgstr "dns-sd"
+
+#~ msgid "%s (in trash)"
+#~ msgstr "%s (в корзине)"
+
+#~ msgid "Can't delete trash"
+#~ msgstr "Не удаётся удалить корзину"
+
+#~ msgid "Trash directory notification not supported"
+#~ msgstr "Уведомление не поддерживается для каталога корзины"
+
#~ msgid "File unavailable"
#~ msgstr "Файл недоступен"