[gnome-control-center] Updated Russian translation
- From: Damned-Lies <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] Updated Russian translation
- Date: Thu, 15 Sep 2016 10:01:08 +0000 (UTC)
commit 67ee3533a8353d5a61bec29829e60c17fdee97f1
Author: Stas Solovey <whats_up tut by>
Date: Thu Sep 15 10:00:58 2016 +0000
Updated Russian translation
po/ru.po | 2221 +++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 1267 insertions(+), 954 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 6015a8d..19cbc8a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -23,8 +23,8 @@ msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-23 20:57+0000\n"
-"PO-Revision-Date: 2016-03-24 00:30+0300\n"
+"POT-Creation-Date: 2016-09-13 09:47+0000\n"
+"PO-Revision-Date: 2016-09-15 12:54+0300\n"
"Last-Translator: Stas Solovey <whats_up tut by>\n"
"Language-Team: Русский <gnome-cyr gnome org>\n"
"Language: ru\n"
@@ -105,7 +105,7 @@ msgstr "Изображения не найдены"
#. * directory in the string below when XDG_PICTURES_DIR is
#. * undefined
#: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/search/cc-search-locations-dialog.c:302
msgid "Home"
msgstr "Домашняя папка"
@@ -120,25 +120,24 @@ msgstr "Можно добавить изображения в папку %s и
#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1563
-#: ../panels/display/cc-display-panel.c:2196
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/display/cc-display-panel.c:1561
+#: ../panels/display/cc-display-panel.c:2206
#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:245
-#: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1269
-#: ../panels/network/net-device-wifi.c:1462
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1298
+#: ../panels/network/net-device-wifi.c:1535
#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2052
+#: ../panels/printers/cc-printers-panel.c:2076
#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:982
+#: ../panels/privacy/cc-privacy-panel.c:1048
#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/search/cc-search-locations-dialog.c:637
#: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1476
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
#: ../panels/user-accounts/um-photo-dialog.c:94
#: ../panels/user-accounts/um-photo-dialog.c:217
#: ../panels/user-accounts/um-user-panel.c:705
@@ -169,16 +168,17 @@ msgstr "Без фона рабочего стола"
msgid "Current background"
msgstr "Текущий фон"
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+msgid "Background"
msgstr "Фон"
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
msgid "Change your background image to a wallpaper or photo"
msgstr "Изменить фоновое изображение на обои или фото"
#. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:4
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
msgid "Wallpaper;Screen;Desktop;"
msgstr "Обои;Экран;Рабочий;"
@@ -218,18 +218,17 @@ msgstr "Аппаратный режим для _авиаперелётов вк
msgid "Turn off the Airplane mode switch to enable Bluetooth."
msgstr "Для включения Bluetooth выключите режим для авиаперелётов."
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Bluetooth"
msgstr "Bluetooth"
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Включение и отключение Bluetooth. Подключение устройств Bluetooth"
#. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
msgid "share;sharing;bluetooth;obex;"
msgstr "общий;доступ;bluetooth;obex;"
@@ -399,7 +398,7 @@ msgstr "Поддерживаемые профили ICC"
#. TRANSLATORS: filter name on the file->open dialog
#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
msgid "All files"
msgstr "Все файлы"
@@ -439,7 +438,7 @@ msgid "Save Profile"
msgstr "Сохранить профиль"
#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:375
+#: ../panels/network/connection-editor/vpn-helpers.c:311
msgid "_Save"
msgstr "_Сохранить"
@@ -698,7 +697,7 @@ msgstr ""
"\"windows\">Microsoft Windows</a>."
#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
msgid "Summary"
msgstr "Краткая информация"
@@ -710,11 +709,11 @@ msgstr "Добавить профиль"
msgid "_Import File…"
msgstr "_Импортировать файл…"
-#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:518
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:546
#: ../panels/printers/new-printer-dialog.ui.h:3
#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
msgid "_Add"
msgstr "_Добавить"
@@ -867,17 +866,18 @@ msgstr "D65 (Фото и графика)"
msgid "D75"
msgstr "D75"
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Color"
msgstr "Цвет"
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
msgid ""
"Calibrate the color of your devices, such as displays, cameras or printers"
msgstr "Калибровка цвета устройств, таких как экраны, камеры или принтеры"
#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
msgstr "Цвет;ICC;Профиль;Калибровка;Принтер;Экран;"
@@ -895,23 +895,23 @@ msgstr "Ещё…"
msgid "No languages found"
msgstr "Ни один язык не найден"
-#: ../panels/common/cc-util.c:125
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:100
msgid "Today"
msgstr "Сегодня"
-#: ../panels/common/cc-util.c:129
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:102
msgid "Yesterday"
msgstr "Вчера"
#. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:136
+#: ../panels/common/cc-util.c:138
msgid "%b %e"
msgstr "%e %b."
#. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:141
+#: ../panels/common/cc-util.c:143
msgid "%b %e, %Y"
msgstr "%e %b. %Y"
@@ -1033,8 +1033,9 @@ msgstr "Ноябрь"
msgid "December"
msgstr "Декабрь"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
msgid "Date & Time"
msgstr "Дата и время"
@@ -1091,12 +1092,12 @@ msgstr "24-часовой"
msgid "AM / PM"
msgstr "12-часовой"
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
msgid "Change the date and time, including time zone"
msgstr "Изменить дату и время, включая часовой пояс"
#. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
msgid "Clock;Timezone;Location;"
msgstr "Часы;Часовой;пояс;Местоположение;"
@@ -1108,207 +1109,222 @@ msgstr "Изменить системное время и дату"
msgid "To change time or date settings, you need to authenticate."
msgstr "Для изменения времени или даты требуется аутентификация."
-#: ../panels/display/cc-display-panel.c:575
+#: ../panels/display/cc-display-panel.c:573
msgid "Lid Closed"
msgstr "Крышка ноутбука закрыта"
#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:576
msgid "Mirrored"
msgstr "Дублируемый"
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/display/cc-display-panel.c:2390
+#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:2429
msgid "Primary"
msgstr "Основной"
-#: ../panels/display/cc-display-panel.c:582
+#: ../panels/display/cc-display-panel.c:580
#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
#: ../panels/universal-access/uap.ui.h:6
msgid "Off"
msgstr "Выключено"
-#: ../panels/display/cc-display-panel.c:585
+#: ../panels/display/cc-display-panel.c:583
msgid "Secondary"
msgstr "Дополнительный"
#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1560
+#: ../panels/display/cc-display-panel.c:1558
msgid "Arrange Combined Displays"
msgstr "Упорядочить сгруппированные экраны"
-#: ../panels/display/cc-display-panel.c:1564
-#: ../panels/display/cc-display-panel.c:2197
+#: ../panels/display/cc-display-panel.c:1562
+#: ../panels/display/cc-display-panel.c:2207
#: ../panels/network/connection-editor/connection-editor.ui.h:2
#: ../panels/network/network-wifi.ui.h:2
msgid "_Apply"
msgstr "_Применить"
-#: ../panels/display/cc-display-panel.c:1588
+#: ../panels/display/cc-display-panel.c:1586
msgid "Drag displays to rearrange them"
msgstr "Перетащите экраны, чтобы изменить их порядок"
#. translators: example string is "60 Hz (NTSC)"
#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1794
+#: ../panels/display/cc-display-panel.c:1793
#, c-format
msgid "%d Hz (NTSC)"
msgstr "%d Гц (NTSC)"
#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1800
+#: ../panels/display/cc-display-panel.c:1799
#, c-format
msgid "%d Hz"
msgstr "%d Гц"
-#: ../panels/display/cc-display-panel.c:2246
+#: ../panels/display/cc-display-panel.c:2259
msgid "Rotate counterclockwise by 90°"
msgstr "Повернуть против часовой стрелки на 90°"
-#: ../panels/display/cc-display-panel.c:2264
+#: ../panels/display/cc-display-panel.c:2277
msgid "Rotate by 180°"
msgstr "Повернуть на 180°"
-#: ../panels/display/cc-display-panel.c:2282
+#: ../panels/display/cc-display-panel.c:2295
msgid "Rotate clockwise by 90°"
msgstr "Повернуть по часовой стрелке на 90°"
-#: ../panels/display/cc-display-panel.c:2303
+#: ../panels/display/cc-display-panel.c:2316
msgid "Size"
msgstr "Размер"
#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2316
+#: ../panels/display/cc-display-panel.c:2331
msgid "Aspect Ratio"
msgstr "Соотношение сторон"
-#: ../panels/display/cc-display-panel.c:2338
+#: ../panels/display/cc-display-panel.c:2354
#: ../panels/printers/pp-options-dialog.c:85
msgid "Resolution"
msgstr "Разрешение"
-#: ../panels/display/cc-display-panel.c:2360
+#: ../panels/display/cc-display-panel.c:2374
+msgid "Adjust for TV"
+msgstr "Отрегулировать для ТВ"
+
+#: ../panels/display/cc-display-panel.c:2398
msgid "Refresh Rate"
msgstr "Частота обновления"
-#: ../panels/display/cc-display-panel.c:2391
+#: ../panels/display/cc-display-panel.c:2430
msgid "Show the top bar and Activities Overview on this display"
msgstr "Показывать верхнюю панель и режим обзора на этом дисплее"
-#: ../panels/display/cc-display-panel.c:2397
+#: ../panels/display/cc-display-panel.c:2436
msgid "Secondary Display"
msgstr "Дополнительный экран"
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2437
msgid "Join this display with another to create an extra workspace"
msgstr "Объединить этот дисплей с другим для увеличения рабочего пространства"
-#: ../panels/display/cc-display-panel.c:2405
+#: ../panels/display/cc-display-panel.c:2444
msgid "Presentation"
msgstr "Презентация"
-#: ../panels/display/cc-display-panel.c:2406
+#: ../panels/display/cc-display-panel.c:2445
msgid "Show slideshows and media only"
msgstr "Показывать только слайд-шоу и мультимедиа"
#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2411
+#: ../panels/display/cc-display-panel.c:2450
msgid "Mirror"
msgstr "Зеркало"
-#: ../panels/display/cc-display-panel.c:2412
+#: ../panels/display/cc-display-panel.c:2451
msgid "Show your existing view on both displays"
msgstr "Показывать текущий вид на обоих дисплеях"
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:2457
msgid "Turn Off"
msgstr "Выключить"
-#: ../panels/display/cc-display-panel.c:2419
+#: ../panels/display/cc-display-panel.c:2458
msgid "Don't use this display"
msgstr "Не использовать этот монитор"
-#: ../panels/display/cc-display-panel.c:2722
+#: ../panels/display/cc-display-panel.c:2769
msgid "Could not get screen information"
msgstr "Не удалось получить информацию об экране"
-#: ../panels/display/cc-display-panel.c:2753
+#: ../panels/display/cc-display-panel.c:2800
msgid "_Arrange Combined Displays"
msgstr "_Расположить объединённые дисплеи"
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+msgid "Displays"
msgstr "Мониторы"
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
msgid "Choose how to use connected monitors and projectors"
msgstr "Выберите, как использовать подключённые мониторы и проекторы"
#. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:4
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
msgstr "Панель;Проектор;xrandr;Экран;Разрешение;Обновить;Монитор;"
-#: ../panels/info/cc-info-panel.c:385
+#: ../panels/info/cc-info-panel.c:345
msgid "Wayland"
msgstr "Wayland"
#. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123
msgid "Unknown"
msgstr "Неизвестно"
-#: ../panels/info/cc-info-panel.c:473
+#: ../panels/info/cc-info-panel.c:481
+#, c-format
+msgid "%s %d-bit (Build ID: %s)"
+msgstr "%s %d-бит (ID сборки: %s)"
+
+#: ../panels/info/cc-info-panel.c:483
+#, c-format
+msgid "%d-bit (Build ID: %s)"
+msgstr "%d-бит (ID сборки: %s)"
+
+#: ../panels/info/cc-info-panel.c:491
#, c-format
msgid "%s %d-bit"
msgstr "%s %d-бит"
-#: ../panels/info/cc-info-panel.c:475
+#: ../panels/info/cc-info-panel.c:493
#, c-format
msgid "%d-bit"
msgstr "%d-бит"
-#: ../panels/info/cc-info-panel.c:1155
+#: ../panels/info/cc-info-panel.c:1174
msgid "Ask what to do"
msgstr "Спрашивать, что делать"
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-panel.c:1178
msgid "Do nothing"
msgstr "Ничего не делать"
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-panel.c:1182
msgid "Open folder"
msgstr "Открыть папку"
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-panel.c:1273
msgid "Other Media"
msgstr "Другой носитель"
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-panel.c:1304
msgid "Select an application for audio CDs"
msgstr "Выберите приложение для звуковых компакт-дисков"
-#: ../panels/info/cc-info-panel.c:1286
+#: ../panels/info/cc-info-panel.c:1305
msgid "Select an application for video DVDs"
msgstr "Выберите приложения для видео DVD"
-#: ../panels/info/cc-info-panel.c:1287
+#: ../panels/info/cc-info-panel.c:1306
msgid "Select an application to run when a music player is connected"
msgstr "Выберите приложение, запускаемое при подключении музыкального плеера"
-#: ../panels/info/cc-info-panel.c:1288
+#: ../panels/info/cc-info-panel.c:1307
msgid "Select an application to run when a camera is connected"
msgstr "Выберите приложение, запускаемое при подключении камеры"
-#: ../panels/info/cc-info-panel.c:1289
+#: ../panels/info/cc-info-panel.c:1308
msgid "Select an application for software CDs"
msgstr "Выберите приложение для компакт-дисков с программами"
@@ -1317,88 +1333,86 @@ msgstr "Выберите приложение для компакт-дисков
#. * If the shared-mime-info translation works for your language,
#. * simply leave these untranslated.
#.
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-panel.c:1320
msgid "audio DVD"
msgstr "звуковой DVD"
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-panel.c:1321
msgid "blank Blu-ray disc"
msgstr "чистый диск Blu-ray"
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-panel.c:1322
msgid "blank CD disc"
msgstr "чистый компакт-диск"
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-panel.c:1323
msgid "blank DVD disc"
msgstr "чистый диск DVD"
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-panel.c:1324
msgid "blank HD DVD disc"
msgstr "чистый диск HD DVD"
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1325
msgid "Blu-ray video disc"
msgstr "видеодиск Blu-ray"
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-panel.c:1326
msgid "e-book reader"
msgstr "устройство чтения электронных книг"
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-panel.c:1327
msgid "HD DVD video disc"
msgstr "видеодиск HD DVD"
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-panel.c:1328
msgid "Picture CD"
msgstr "диск Picture CD"
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-panel.c:1329
msgid "Super Video CD"
msgstr "компакт-диск Super Video"
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-panel.c:1330
msgid "Video CD"
msgstr "видеодиск VCD"
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-panel.c:1331
msgid "Windows software"
msgstr "приложение Windows"
-#: ../panels/info/cc-info-panel.c:1435
-#: ../panels/keyboard/keyboard-shortcuts.c:1949
+#: ../panels/info/cc-info-panel.c:1454
msgid "Section"
msgstr "Раздел"
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14
msgid "Overview"
msgstr "Обзор"
-#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21
msgid "Default Applications"
msgstr "Приложения по умолчанию"
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29
msgid "Removable Media"
msgstr "Съёмный носитель"
-#: ../panels/info/cc-info-panel.c:1480
+#: ../panels/info/cc-info-panel.c:1499
#, c-format
msgid "Version %s"
msgstr "Версия %s"
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:240
-#: ../panels/network/network-wifi.ui.h:46
-msgid "Details"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "Details"
msgstr "Подробности"
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
msgid "View information about your system"
msgstr "Просмотр информации о системе"
#. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
msgid ""
"device;system;information;memory;processor;version;default;application;"
"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1574,8 +1588,9 @@ msgstr "Запуск приложений"
msgid "Launch help browser"
msgstr "Запустить справочный браузер"
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
msgid "Settings"
msgstr "Параметры"
@@ -1648,7 +1663,6 @@ msgid "Lock screen"
msgstr "Заблокировать экран"
#: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
msgid "Universal Access"
msgstr "Универсальный доступ"
@@ -1684,11 +1698,21 @@ msgstr "Уменьшить размер текста"
msgid "High contrast on or off"
msgstr "Включить или выключить высокую контрастность"
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:522
+#: ../panels/keyboard/cc-keyboard-manager.c:830
+msgid "Custom Shortcuts"
+msgstr "Дополнительные комбинации клавиш"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
#. translators:
#. * The device has been disabled
#: ../panels/keyboard/cc-keyboard-option.c:276
#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:1220
+#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/shortcut-editor.ui.h:2
#: ../panels/network/network-wifi.ui.h:31
#: ../panels/sound/gvc/gvc-mixer-control.c:1830
#: ../panels/user-accounts/um-fingerprint-dialog.c:213
@@ -1715,115 +1739,129 @@ msgstr "Композиционная клавиша"
msgid "Modifiers-only switch to next source"
msgstr "Клавиша-модификатор переключает источник ввода"
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "Клавиатура"
+#: ../panels/keyboard/cc-keyboard-panel.c:215
+msgid "Reset the shortcut to its default value"
+msgstr "Сбросить комбинацию на значение по умолчанию"
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#, c-format
+msgid ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be "
+"disabled"
+msgstr ""
+"%s уже используется для <b>%s</b>. Если применить, комбинация для %s будет "
+"отключена"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#| msgid "Custom Shortcut"
+msgid "Set Custom Shortcut"
+msgstr "Установить пользовательскую комбинацию клавиш"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+#| msgid "Add Shortcut"
+msgid "Set Shortcut"
+msgstr "Установить комбинацию клавиш"
+
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr "Введите новую комбинацию для изменения <b>%s</b>."
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937
+#| msgid "Custom Shortcut"
+msgid "Add Custom Shortcut"
+msgstr "Добавить пользовательскую комбинацию клавиш"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+msgid "Keyboard"
+msgstr "Клавиа­тура"
+
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
msgid "View and change keyboard shortcuts and set your typing preferences"
msgstr "Просмотр и изменение комбинаций клавиш, а также настройка ввода"
#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
msgid "Shortcut;Repeat;Blink;"
msgstr "Комбинация;Повтор;Мигание;"
#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "Дополнительные комбинации клавиш"
+#| msgid "Keyboard Shortcuts"
+msgid "No keyboard shortcut found"
+msgstr "Комбинации клавиш не найдена"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "_Название:"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "Коман_да:"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Try a different search"
+msgstr "Попробуйте другой поисковый запрос"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Add Shortcut"
-msgstr "Добавить комбинацию клавиш"
+#: ../panels/keyboard/shortcut-editor.ui.h:1
+msgid "Press Esc to cancel."
+msgstr "Нажмите клавишу Esc для отмены."
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "Remove Shortcut"
-msgstr "Удалить комбинацию клавиш"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "Имя"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
-msgstr ""
-"Чтобы изменить комбинацию клавиш, нажмите на строку и зажмите новые клавиши; "
-"для очистки нажмите Backspace."
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+msgid "Command"
+msgstr "Команда"
-#: ../panels/keyboard/keyboard-shortcuts.c:633
-#: ../panels/keyboard/keyboard-shortcuts.c:641
-msgid "Custom Shortcuts"
-msgstr "Дополнительные комбинации клавиш"
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+msgid "Shortcut"
+msgstr "Комбинация"
-#: ../panels/keyboard/keyboard-shortcuts.c:858
-msgid "<Unknown Action>"
-msgstr "<Неизвестное действие>"
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+msgid "Edit"
+msgstr "Правка"
-#: ../panels/keyboard/keyboard-shortcuts.c:1359
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"Нельзя использовать комбинацию «%s», поскольку набор с использованием этой "
-"клавиши станет невозможным.\n"
-"Попробуйте клавиши Control, Alt или Shift одновременно."
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "Нет"
-#: ../panels/keyboard/keyboard-shortcuts.c:1389
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"Комбинация клавиш «%s» уже используется для\n"
-"«%s»"
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+msgid "Remove"
+msgstr "Удалить"
-#: ../panels/keyboard/keyboard-shortcuts.c:1394
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr ""
-"После переопределения комбинации на «%s», комбинация «%s» будет выключена."
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Enter the new shortcut"
+msgstr "Введите новую комбинацию"
-#: ../panels/keyboard/keyboard-shortcuts.c:1400
-msgid "_Reassign"
-msgstr "_Переопределить"
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "Отменить"
-#: ../panels/keyboard/keyboard-shortcuts.c:1441
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
-msgstr "Комбинация «%s» используется для «%s». Переопределить её для «%s»?"
+#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: ../panels/network/connection-editor/ce-page-ip4.c:276
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
+msgid "Add"
+msgstr "Добавить"
-#: ../panels/keyboard/keyboard-shortcuts.c:1451
-#, c-format
-msgid ""
-"\"%s\" is currently associated with \"%s\", this shortcut will be disabled "
-"if you move forward."
-msgstr ""
-"Комбинация «%s» сейчас используется для «%s», эта комбинация будет выключена."
+#: ../panels/keyboard/shortcut-editor.ui.h:13
+msgid "Replace"
+msgstr "Заменить"
-#: ../panels/keyboard/keyboard-shortcuts.c:1458
-msgid "_Assign"
-msgstr "_Назначить"
+#: ../panels/keyboard/shortcut-editor.ui.h:14
+msgid "Set"
+msgstr "Установить"
#: ../panels/mouse/cc-mouse-panel.c:82
msgid "Test Your _Settings"
msgstr "_Проверить параметры"
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
-msgstr "Мышь и сенсорная панель"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+msgid "Mouse & Touchpad"
+msgstr "Мышь и сенсор­ная панель"
+
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
msgid ""
"Change your mouse or touchpad sensitivity and select right or left-handed"
msgstr ""
@@ -1831,7 +1869,7 @@ msgstr ""
"кнопок для правши или левши"
#. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
msgstr "Трэкпад;Указатель;Щелчок;Нажатие;Двойной;Кнопка;Трэкбол;Прокрутка;"
@@ -1890,6 +1928,10 @@ msgid "Tap to Click"
msgstr "Нажатие касанием"
#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+msgid "Two-finger Scrolling"
+msgstr "Прокрутка двумя пальцами"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
msgid "Edge Scrolling"
msgstr "Участки прокрутки по краям"
@@ -1928,11 +1970,11 @@ msgstr "Один щелчок, вторичная кнопка"
#. TRANSLATORS: this is to disable the radio hardware in the
#. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:349
msgid "Air_plane Mode"
msgstr "Режим для _авиаперелётов"
-#: ../panels/network/cc-network-panel.c:967
+#: ../panels/network/cc-network-panel.c:953
msgid "Network proxy"
msgstr "Сетевая прокси-служба"
@@ -1940,19 +1982,19 @@ msgstr "Сетевая прокси-служба"
#. * window for vpn connections, it is also used to display
#. * vpn connections in the device list.
#.
-#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:432
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
#, c-format
msgid "%s VPN"
msgstr "VPN %s"
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:1194
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr ""
"К сожалению, что-то пошло не так. Обратитесь к поставщику программного "
"обеспечения."
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:1200
msgid "NetworkManager needs to be running."
msgstr "NetworkManager должен быть запущен."
@@ -1968,7 +2010,7 @@ msgstr "страница 1"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
msgid "Anony_mous identity"
@@ -1985,59 +2027,64 @@ msgstr "Внутренняя _аутентификация"
msgid "page 2"
msgstr "страница 2"
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:469
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:459
#: ../panels/network/connection-editor/details-page.ui.h:3
#: ../panels/network/network-wifi.ui.h:6
msgid "Security"
msgstr "Безопасность"
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
msgid "automatic"
msgstr "автоматический"
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "Профиль %d"
+
#. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:383
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:214
+#: ../panels/network/net-device-wifi.c:390
msgid "WEP"
msgstr "WEP"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:223
-#: ../panels/network/net-device-wifi.c:388
+#: ../panels/network/connection-editor/ce-page-details.c:54
+#: ../panels/network/net-device-wifi.c:218
+#: ../panels/network/net-device-wifi.c:395
#: ../panels/network/network-wifi.ui.h:19
msgid "WPA"
msgstr "WPA"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:222
msgid "WPA2"
msgstr "WPA2"
#. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:227
msgid "Enterprise"
msgstr "Предприятие"
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:237
-#: ../panels/network/net-device-wifi.c:373
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/net-device-wifi.c:380
msgctxt "Wifi security"
msgid "None"
msgstr "Нет"
-#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/network/connection-editor/ce-page-details.c:89
#: ../panels/power/power.ui.h:17
msgid "Never"
msgstr "Никогда"
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:485
#, c-format
msgid "%i day ago"
msgid_plural "%i days ago"
@@ -2046,179 +2093,179 @@ msgstr[1] "%i дня назад"
msgstr[2] "%i дней назад"
#. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:542
#, c-format
msgid "%d Mb/s"
msgstr "%d Мб/с"
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:571
msgctxt "Signal strength"
msgid "None"
msgstr "Нет"
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:573
msgctxt "Signal strength"
msgid "Weak"
msgstr "Слабый"
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:575
msgctxt "Signal strength"
msgid "Ok"
msgstr "Средний"
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:577
msgctxt "Signal strength"
msgid "Good"
msgstr "Хороший"
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:579
msgctxt "Signal strength"
msgid "Excellent"
msgstr "Отличный"
-#: ../panels/network/connection-editor/ce-page-ethernet.c:226
-#: ../panels/network/connection-editor/ce-page-vpn.c:220
-#: ../panels/network/connection-editor/ce-page-wifi.c:262
+#: ../panels/network/connection-editor/ce-page-details.c:225
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+msgid "Details"
+msgstr "Подробности"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:215
+#: ../panels/network/connection-editor/ce-page-vpn.c:221
+#: ../panels/network/connection-editor/ce-page-wifi.c:227
#: ../panels/network/network-wifi.ui.h:47
msgid "Identity"
msgstr "Идентификация"
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
+#: ../panels/network/connection-editor/ce-page-ip4.c:178
+#: ../panels/network/connection-editor/ce-page-ip4.c:432
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
msgid "Address"
msgstr "Адрес"
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip4.c:191
+#: ../panels/network/connection-editor/ce-page-ip4.c:445
msgid "Netmask"
msgstr "Маска сети"
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip4.c:205
+#: ../panels/network/connection-editor/ce-page-ip4.c:458
+#: ../panels/network/connection-editor/ce-page-ip6.c:206
+#: ../panels/network/connection-editor/ce-page-ip6.c:453
#: ../panels/network/network-vpn.ui.h:2
msgid "Gateway"
msgstr "Шлюз"
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:222
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
msgid "Delete Address"
msgstr "Удалить адрес"
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "Добавить"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
+#: ../panels/network/connection-editor/ce-page-ip4.c:339
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
msgid "Server"
msgstr "Сервер"
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:356
+#: ../panels/network/connection-editor/ce-page-ip6.c:351
msgid "Delete DNS Server"
msgstr "Удалить сервер DNS"
#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
+#: ../panels/network/connection-editor/ce-page-ip4.c:472
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
msgctxt "network parameters"
msgid "Metric"
msgstr "Метрика"
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:493
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
msgid "Delete Route"
msgstr "Удалить маршрут"
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
+#: ../panels/network/connection-editor/ce-page-ip4.c:597
#: ../panels/network/network-wifi.ui.h:27
msgid "Automatic (DHCP)"
msgstr "Автоматический (DHCP)"
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
+#: ../panels/network/connection-editor/ce-page-ip4.c:601
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
msgid "Manual"
msgstr "Вручную"
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
+#: ../panels/network/connection-editor/ce-page-ip4.c:605
+#: ../panels/network/connection-editor/ce-page-ip6.c:596
msgid "Link-Local Only"
msgstr "Только для локальной сети"
-#: ../panels/network/connection-editor/ce-page-ip4.c:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:942
#: ../panels/network/network-wifi.ui.h:48
msgid "IPv4"
msgstr "IPv4"
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:193
+#: ../panels/network/connection-editor/ce-page-ip6.c:440
msgid "Prefix"
msgstr "Префикс"
-#: ../panels/network/connection-editor/ce-page-ip6.c:613
+#: ../panels/network/connection-editor/ce-page-ip6.c:584
#: ../panels/network/connection-editor/ethernet-page.ui.h:1
#: ../panels/network/connection-editor/ip4-page.ui.h:4
#: ../panels/network/connection-editor/ip6-page.ui.h:4
#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
msgid "Automatic"
msgstr "Автоматический"
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
+#: ../panels/network/connection-editor/ce-page-ip6.c:588
msgid "Automatic, DHCP only"
msgstr "Автоматический, только DHCP"
-#: ../panels/network/connection-editor/ce-page-ip6.c:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:898
#: ../panels/network/network-wifi.ui.h:49
msgid "IPv6"
msgstr "IPv6"
-#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/connection-editor/ce-page-reset.c:78
#: ../panels/network/network-wifi.ui.h:51
msgid "Reset"
msgstr "Сбросить"
-#: ../panels/network/connection-editor/ce-page-security.c:253
+#: ../panels/network/connection-editor/ce-page-security.c:248
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "Нет"
-#: ../panels/network/connection-editor/ce-page-security.c:276
+#: ../panels/network/connection-editor/ce-page-security.c:271
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "40/128-битный ключ WEP (Hex или ASCII)"
-#: ../panels/network/connection-editor/ce-page-security.c:286
+#: ../panels/network/connection-editor/ce-page-security.c:281
msgid "WEP 128-bit Passphrase"
msgstr "128-битная парольная фраза WEP"
-#: ../panels/network/connection-editor/ce-page-security.c:299
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
msgid "LEAP"
msgstr "LEAP"
-#: ../panels/network/connection-editor/ce-page-security.c:312
+#: ../panels/network/connection-editor/ce-page-security.c:307
msgid "Dynamic WEP (802.1x)"
msgstr "Динамический WEP (802.1x)"
-#: ../panels/network/connection-editor/ce-page-security.c:326
+#: ../panels/network/connection-editor/ce-page-security.c:321
msgid "WPA & WPA2 Personal"
msgstr "Персональный WPA и WPA2"
-#: ../panels/network/connection-editor/ce-page-security.c:340
+#: ../panels/network/connection-editor/ce-page-security.c:335
msgid "WPA & WPA2 Enterprise"
msgstr "Корпоративный WPA и WPA2"
@@ -2233,30 +2280,30 @@ msgid "Link speed"
msgstr "Скорость передачи данных"
#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
+#: ../panels/network/net-device-ethernet.c:153
#: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
msgid "IPv4 Address"
msgstr "Адрес IPv4"
#: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
#: ../panels/network/network-mobile.ui.h:4
#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
msgid "IPv6 Address"
msgstr "Адрес IPv6"
#: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:165
+#: ../panels/network/net-device-ethernet.c:161
#: ../panels/network/network-simple.ui.h:2
#: ../panels/network/network-wifi.ui.h:9
msgid "Hardware Address"
msgstr "Аппаратный адрес"
#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../panels/network/net-device-ethernet.c:165
#: ../panels/network/network-mobile.ui.h:5
#: ../panels/network/network-simple.ui.h:5
#: ../panels/network/network-wifi.ui.h:10
@@ -2266,7 +2313,7 @@ msgstr "Маршрут по умолчанию"
#: ../panels/network/connection-editor/details-page.ui.h:8
#: ../panels/network/connection-editor/ip4-page.ui.h:3
#: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:171
+#: ../panels/network/net-device-ethernet.c:167
#: ../panels/network/network-mobile.ui.h:6
#: ../panels/network/network-simple.ui.h:6
#: ../panels/network/network-wifi.ui.h:11
@@ -2349,13 +2396,13 @@ msgstr "Подключаться _автоматически"
msgid "Firewall _Zone"
msgstr "_Зона брандмауэра"
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:118
msgctxt "Firewall zone"
msgid "Default"
msgstr "По умолчанию"
-#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:50
msgid "The zone defines the trust level of the connection"
msgstr "Зона определяет уровень доверия соединению"
@@ -2397,47 +2444,25 @@ msgstr "Использовать это подключение _только д
msgid "IPv_6"
msgstr "IPv_6"
-#: ../panels/network/connection-editor/net-connection-editor.c:275
+#: ../panels/network/connection-editor/net-connection-editor.c:296
msgid "Unable to open connection editor"
msgstr "Не удалось открыть редактор соединений"
-#: ../panels/network/connection-editor/net-connection-editor.c:293
+#: ../panels/network/connection-editor/net-connection-editor.c:314
msgid "New Profile"
msgstr "Создать профиль"
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:635
msgid "VPN"
msgstr "VPN"
-# см. network-manager-applet
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr "Агрегированное (Bond)"
-
-# см. network-manager-applet
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-msgid "Team"
-msgstr "Агрегированное (Team)"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "Bridge"
-msgstr "Мост"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:589
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:740
-msgid "Could not load VPN plugins"
-msgstr "Не удалось загрузить модули VPN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:809
+#: ../panels/network/connection-editor/net-connection-editor.c:783
msgid "Import from file…"
msgstr "Импортировать из файла…"
-#: ../panels/network/connection-editor/net-connection-editor.c:880
-msgid "Add Network Connection"
-msgstr "Добавить сетевое подключение"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+msgid "Add VPN"
+msgstr "Добавить VPN"
#: ../panels/network/connection-editor/reset-page.ui.h:1
#: ../panels/network/network-wifi.ui.h:41
@@ -2445,7 +2470,7 @@ msgid "_Reset"
msgstr "_Сбросить"
#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1463
+#: ../panels/network/net-device-wifi.c:1536
#: ../panels/network/network-wifi.ui.h:42
msgid "_Forget"
msgstr "_Забыть"
@@ -2471,11 +2496,11 @@ msgstr ""
msgid "S_ecurity"
msgstr "_Безопасность"
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
msgid "Cannot import VPN connection"
msgstr "Не удалось импортировать соединение VPN"
-#: ../panels/network/connection-editor/vpn-helpers.c:207
+#: ../panels/network/connection-editor/vpn-helpers.c:143
#, c-format
msgid ""
"The file '%s' could not be read or does not contain recognized VPN "
@@ -2488,36 +2513,36 @@ msgstr ""
"\n"
"Ошибка: %s."
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
msgid "Select file to import"
msgstr "Выберите файл для импортирования"
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:2053
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2077
#: ../panels/sharing/cc-sharing-panel.c:373
#: ../panels/user-accounts/um-photo-dialog.c:218
msgid "_Open"
msgstr "_Открыть"
-#: ../panels/network/connection-editor/vpn-helpers.c:294
+#: ../panels/network/connection-editor/vpn-helpers.c:230
#, c-format
msgid "A file named \"%s\" already exists."
msgstr "Файл с именем «%s» уже существует."
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
msgid "_Replace"
msgstr "_Заменить"
-#: ../panels/network/connection-editor/vpn-helpers.c:298
+#: ../panels/network/connection-editor/vpn-helpers.c:234
#, c-format
msgid "Do you want to replace %s with the VPN connection you are saving?"
msgstr "Заменить %s сохраняемым VPN-соединением?"
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
msgid "Cannot export VPN connection"
msgstr "Не удалось экспортировать соединение VPN"
-#: ../panels/network/connection-editor/vpn-helpers.c:336
+#: ../panels/network/connection-editor/vpn-helpers.c:272
#, c-format
msgid ""
"The VPN connection '%s' could not be exported to %s.\n"
@@ -2528,7 +2553,7 @@ msgstr ""
"\n"
"Ошибка: %s."
-#: ../panels/network/connection-editor/vpn-helpers.c:371
+#: ../panels/network/connection-editor/vpn-helpers.c:307
msgid "Export VPN connection"
msgstr "Экспортировать VPN-соединение"
@@ -2555,62 +2580,46 @@ msgstr "Моя домашняя сеть"
msgid "Make available to _other users"
msgstr "Сделать доступным для _других пользователей"
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Network"
msgstr "Сеть"
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
msgid "Control how you connect to the Internet"
msgstr "Управление подключением к Интернету"
#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
msgid ""
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
msgstr ""
-"Сеть;Беспроводная;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Широковещательное;Модем;"
-"Bluetooth;vpn;vlan;мост;bond;агрегированное;DNS;"
-
-# см. network-manager-applet
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "Слейвы агрегированного соединения (Bond)"
-
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(нет)"
+"Сеть;Беспроводная;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Мобильная;Модем;Bluetooth;vpn;"
+"DNS;"
-# см. network-manager-applet
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "Слейвы сетевого моста"
-
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:463
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:471
msgid "never"
msgstr "никогда"
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:481
msgid "today"
msgstr "сегодня"
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:483
msgid "yesterday"
msgstr "вчера"
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698
-#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
msgid "IP Address"
msgstr "Адрес IP"
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
#: ../panels/network/network-wifi.ui.h:12
msgid "Last used"
msgstr "Последнее использование"
@@ -2620,34 +2629,25 @@ msgstr "Последнее использование"
#. * profile. It is also used to display ethernet in the
#. * device list.
#.
-#: ../panels/network/net-device-ethernet.c:286
+#: ../panels/network/net-device-ethernet.c:280
#: ../panels/network/network-ethernet.ui.h:1
#: ../panels/network/network-simple.ui.h:1
msgid "Wired"
msgstr "Проводное"
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1621
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1694
#: ../panels/network/network-ethernet.ui.h:3
#: ../panels/network/network-mobile.ui.h:8
#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
msgid "Options…"
msgstr "Параметры…"
-#: ../panels/network/net-device-ethernet.c:473
-#, c-format
-msgid "Profile %d"
-msgstr "Профиль %d"
-
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:223
msgid "Add new connection"
msgstr "Добавить новое подключение"
-#: ../panels/network/net-device-team.c:77
-msgid "Team slaves"
-msgstr "Слейвы агрегированного соединения (Team)"
-
-#: ../panels/network/net-device-wifi.c:1176
+#: ../panels/network/net-device-wifi.c:1205
msgid ""
"If you have a connection to the Internet other than wireless, you can set up "
"a wireless hotspot to share the connection with others."
@@ -2656,14 +2656,14 @@ msgstr ""
"подключение к Интернету, беспроводную точку доступа можно настроить для "
"подключения к Интернету других пользователей."
-#: ../panels/network/net-device-wifi.c:1180
+#: ../panels/network/net-device-wifi.c:1209
#, c-format
msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
msgstr ""
"Переключение на беспроводную точку доступа приведёт к отключению от <b>%s</"
"b>."
-#: ../panels/network/net-device-wifi.c:1184
+#: ../panels/network/net-device-wifi.c:1213
msgid ""
"It is not possible to access the Internet through your wireless while the "
"hotspot is active."
@@ -2671,23 +2671,23 @@ msgstr ""
"Доступ к Интернету по беспроводному каналу возможен только при отключённой "
"точке доступа."
-#: ../panels/network/net-device-wifi.c:1267
+#: ../panels/network/net-device-wifi.c:1296
msgid "Stop hotspot and disconnect any users?"
msgstr "Остановить точку доступа и отключить всех пользователей?"
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1299
msgid "_Stop Hotspot"
msgstr "_Остановить точку доступа"
-#: ../panels/network/net-device-wifi.c:1327
+#: ../panels/network/net-device-wifi.c:1397
msgid "System policy prohibits use as a Hotspot"
msgstr "Использование в качестве точки доступа запрещено системной политикой"
-#: ../panels/network/net-device-wifi.c:1330
+#: ../panels/network/net-device-wifi.c:1400
msgid "Wireless device does not support Hotspot mode"
msgstr "Беспроводное устройство не поддерживает режим точки доступа"
-#: ../panels/network/net-device-wifi.c:1459
+#: ../panels/network/net-device-wifi.c:1532
msgid ""
"Network details for the selected networks, including passwords and any "
"custom configuration will be lost."
@@ -2695,11 +2695,11 @@ msgstr ""
"Сетевые данные для выделенных сетей, включая пароли и любые пользовательские "
"настройки, будут утеряны."
-#: ../panels/network/net-device-wifi.c:1774
+#: ../panels/network/net-device-wifi.c:1842
msgid "History"
msgstr "История"
-#: ../panels/network/net-device-wifi.c:1778
+#: ../panels/network/net-device-wifi.c:1846
#: ../panels/printers/options-dialog.ui.h:2
#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
#: ../panels/wacom/gnome-wacom-properties.ui.h:5
@@ -2707,7 +2707,7 @@ msgid "_Close"
msgstr "_Закрыть"
#. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1786
+#: ../panels/network/net-device-wifi.c:1854
msgctxt "Wi-Fi Network"
msgid "_Forget"
msgstr "_Забыть"
@@ -2744,6 +2744,10 @@ msgstr "IMEI"
msgid "Provider"
msgstr "Провайдер"
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Сеть"
+
#: ../panels/network/network-proxy.ui.h:1
msgctxt "proxy method"
msgid "None"
@@ -2849,16 +2853,12 @@ msgstr "подробности"
#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
#: ../panels/network/wireless-security/ws-leap.ui.h:2
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/sharing/sharing.ui.h:11
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
msgid "_Password"
msgstr "_Пароль"
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "Нет"
-
#: ../panels/network/network-wifi.ui.h:21
msgid "Show P_assword"
msgstr "Показать п_ароль"
@@ -2952,7 +2952,6 @@ msgid "_Connect to Hidden Network…"
msgstr "_Подключиться к скрытой сети…"
#: ../panels/network/network-wifi.ui.h:58
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
msgid "_History"
msgstr "_История"
@@ -2974,359 +2973,337 @@ msgstr "Тип безопасности"
#: ../panels/network/network-wifi.ui.h:63
#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
msgid "Password"
msgstr "Пароль"
#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
msgid "Ad-hoc"
msgstr "Ad-hoc"
#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
msgid "Infrastructure"
msgstr "Инфраструктура"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
msgid "Status unknown"
msgstr "Состояние неизвестно"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
msgid "Unmanaged"
msgstr "Неуправляемое"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
msgid "Unavailable"
msgstr "Недоступно"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
msgid "Connecting"
msgstr "Подключение"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
msgid "Authentication required"
msgstr "Требуется аутентификация"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
msgid "Connected"
msgstr "Подключено"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
msgid "Disconnecting"
msgstr "Отключение"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
msgid "Connection failed"
msgstr "Сбой подключения"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
msgid "Status unknown (missing)"
msgstr "Состояние неизвестно (отсутствует)"
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
msgid "Not connected"
msgstr "Не подключено"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
msgid "Configuration failed"
msgstr "Сбой настройки"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
msgid "IP configuration failed"
msgstr "Сбой настройки IP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
msgid "IP configuration expired"
msgstr "Истёк срок настроек IP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
msgid "Secrets were required, but not provided"
msgstr "Требуется пароль, но он не задан"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
msgid "802.1x supplicant disconnected"
msgstr "Клиент 802.1x отключён"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
msgid "802.1x supplicant configuration failed"
msgstr "Сбой настройки клиента 802.1x"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
msgid "802.1x supplicant failed"
msgstr "Сбой клиента 802.1x"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
msgid "802.1x supplicant took too long to authenticate"
msgstr "Клиент 802.1x слишком долго ожидал аутентификации"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
msgid "PPP service failed to start"
msgstr "Не удалось запустить службу PPP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
msgid "PPP service disconnected"
msgstr "Служба PPP отключена"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
msgid "PPP failed"
msgstr "Сбой PPP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
msgid "DHCP client failed to start"
msgstr "Не удалось запустить клиент DHCP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
msgid "DHCP client error"
msgstr "Ошибка клиента DHCP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
msgid "DHCP client failed"
msgstr "Сбой клиента DHCP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
msgid "Shared connection service failed to start"
msgstr "Не удалось запустить службу общего подключения"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
msgid "Shared connection service failed"
msgstr "Сбой службы общего подключения"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
msgid "AutoIP service failed to start"
msgstr "Не удалось запустить службу AutoIP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
msgid "AutoIP service error"
msgstr "Ошибка службы AutoIP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
msgid "AutoIP service failed"
msgstr "Сбой службы AutoIP"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
msgid "Line busy"
msgstr "Линия занята"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
msgid "No dial tone"
msgstr "Нет гудка в линии"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
msgid "No carrier could be established"
msgstr "Невозможно установить несущую"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
msgid "Dialing request timed out"
msgstr "Время, отведённое на звонок, истекло"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
msgid "Dialing attempt failed"
msgstr "Не удалось дозвониться"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
msgid "Modem initialization failed"
msgstr "Не удалось инициализировать модем"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
msgid "Failed to select the specified APN"
msgstr "Не удалось выбрать указанный APN"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
msgid "Not searching for networks"
msgstr "Нет сетей для поиска"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
msgid "Network registration denied"
msgstr "Отказано в регистрации в сети"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
msgid "Network registration timed out"
msgstr "Время в регистрации сети истекло"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
msgid "Failed to register with the requested network"
msgstr "Не удалось зарегистрироваться в запрошенной сети"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
msgid "PIN check failed"
msgstr "Сбой проверки PIN"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
msgid "Firmware for the device may be missing"
msgstr "Возможно, отсутствует микропрограмма устройства"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
msgid "Connection disappeared"
msgstr "Подключение пропало"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
msgid "Existing connection was assumed"
msgstr "Предполагалось, что соединение существует"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
msgid "Modem not found"
msgstr "Модем не найден"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
msgid "Bluetooth connection failed"
msgstr "Сбой подключения по Bluetooth"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
msgid "SIM Card not inserted"
msgstr "Не вставлена SIM-карта"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
msgid "SIM Pin required"
msgstr "Требуется SIM Pin"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
msgid "SIM Puk required"
msgstr "Требуется SIM Puk"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
msgid "SIM wrong"
msgstr "Некорректный SIM"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr "Устройство InfiniBand не поддерживает режим подключения"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
msgid "Connection dependency failed"
msgstr "Сбой зависимости подключения"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
msgid "Firmware missing"
msgstr "Отсутствует прошивка"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
msgid "Cable unplugged"
msgstr "Кабель не подключён"
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Сертификат центра сертификации не выбран"
+#: ../panels/network/wireless-security/eap-method.c:69
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr "неизвестная ошибка в безопасности 802.1x (wpa-eap)"
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"Если вы не используете сертификат центра сертификации, это может привести к "
-"проблемам безопасности. Хотите выбрать сертификат центра сертификации?"
-
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "Игнорировать"
+#: ../panels/network/wireless-security/eap-method.c:245
+msgid "no file selected"
+msgstr "файлы не выбраны"
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Выбрать сертификат ЦС"
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid "unspecified error validating eap-method file"
+msgstr "неизвестная ошибка проверки файла ЕАР-методом"
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Закрытые ключи DER, PEM, или PKCS#12 (*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:480
+#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, или приватные ключи PKCS#12 (*.der, *.pem, *.p12, *.key)"
-#: ../panels/network/wireless-security/eap-method.c:648
+#: ../panels/network/wireless-security/eap-method.c:483
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "Сертификаты DER или PEM (*.der, *.pem, *.crt, *.cer)"
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr "отсутствует файл EAP-FAST PAC"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:333
msgid "GTC"
msgstr "GTC"
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:288
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
msgid "Choose a PAC file"
msgstr "Выберите PAC-файл"
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
msgid "PAC files (*.pac)"
msgstr "Файлы PAC (*.pac)"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
-msgid "PAC _file"
-msgstr "_Файл PAC"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
-msgid "_Inner authentication"
-msgstr "_Внутренняя аутентификация"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
-msgstr "_Инициализация PAC"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
@@ -3335,41 +3312,74 @@ msgstr "_Инициализация PAC"
msgid " "
msgstr " "
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
msgid "Anonymous"
msgstr "Анонимный"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
msgid "Authenticated"
msgstr "Аутентифицированный"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
msgid "Both"
msgstr "Оба"
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file"
+msgstr "_Файл PAC"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Inner authentication"
+msgstr "_Внутренняя аутентификация"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#| msgid "PAC pro_visioning"
+msgid "Allow automatic PAC pro_visioning"
+msgstr "Разрешить автоматическое _выделение ресурсов PAC"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "отсутствует имя пользователя EAP-LEAP"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "отсутствует пароль EAP-LEAP"
+
#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
msgid "_Username"
msgstr "_Имя пользователя"
#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
#: ../panels/network/wireless-security/ws-leap.ui.h:3
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
msgid "Sho_w password"
msgstr "_Показывать пароль"
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "недействительный сертификат EAP-PEAP CA: %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr "недействительный сертификат EAP-PEAP CA: сертификат не указан"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:318
+#: ../panels/network/wireless-security/wireless-security.c:439
msgid "MD5"
msgstr "MD5"
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:412
msgid "Choose a Certificate Authority certificate"
msgstr "Выберите сертификат центра сертификации"
@@ -3385,21 +3395,60 @@ msgstr "Версия 1"
#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
msgid "C_A certificate"
-msgstr "Сертификат _CA"
+msgstr "Сертификат C_A"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#| msgid "Authentication required"
+msgid "No CA certificate is _required"
+msgstr "Сертификат CA не _требуется"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
msgid "PEAP _version"
msgstr "_Версия PEAP"
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Спрашивать каждый раз этот пароль"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr "отсутствует имя пользователя EAP"
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+#| msgid "Change Password"
+msgid "missing EAP password"
+msgstr "отсутствует пароль EAP"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "отсутствует идентичность EAP-TLS"
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "недействительный сертификат EAP-TLS CA: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "недействительный сертификат EAP-TLS CA: сертификат не указан"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr "недействительный пароль EAP-TLS: пароль отсутствует"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "недействительный секретный ключ EAP-TLS: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "недействительный пользовательский сертификат EAP-TLS: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
msgid "Unencrypted private keys are insecure"
msgstr "Незашифрованные закрытые ключи являются небезопасными"
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:319
msgid ""
"The selected private key does not appear to be protected by a password. "
"This could allow your security credentials to be compromised. Please select "
@@ -3413,11 +3462,11 @@ msgstr ""
"\n"
"(Вы можете защитить приватный ключ с помощью openssl)"
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
msgid "Choose your personal certificate"
msgstr "Выберите свой персональный сертификат"
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
msgid "Choose your private key"
msgstr "Выберите ваш приватный ключ"
@@ -3429,51 +3478,56 @@ msgstr "_Подлинность"
msgid "_User certificate"
msgstr "_Сертификат пользователя"
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
msgid "Private _key"
msgstr "Приватный _ключ"
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
msgid "_Private key password"
msgstr "_Пароль приватного ключа"
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "недействительный сертификат EAP-TTLS CA: %s"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr "недействительный сертификат EAP-TTLS CA: сертификат не указан"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:258
msgid "PAP"
msgstr "PAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
msgid "MSCHAP"
msgstr "MSCHAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
msgid "CHAP"
msgstr "CHAP"
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Больше не предупреждать"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1x security"
+msgstr "Неизвестная ошибка проверки безопасности 802.1x"
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Нет"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Да"
-
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
msgid "TLS"
msgstr "TLS"
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr "PWD"
+
+#: ../panels/network/wireless-security/wireless-security.c:486
msgid "FAST"
msgstr "FAST"
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
msgid "Tunneled TLS"
msgstr "Туннелированный TLS"
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
msgid "Protected EAP (PEAP)"
msgstr "Защищённый EAP (PEAP)"
@@ -3483,6 +3537,51 @@ msgstr "Защищённый EAP (PEAP)"
msgid "Au_thentication"
msgstr "А_утентификация"
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr "отсутствует leap-имя пользователя"
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+msgid "missing leap-password"
+msgstr "отсутствует leap-пароль"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr "отсутствует wep-ключ"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr ""
+"недействительный wep-ключ: ключ с длиной %zu должен содержать только "
+"шестнадцатеричные цифры"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+"недействительный wep-ключ: ключ с длиной %zu должен содержать только символы "
+"ASCII"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+"недействительный wep-ключ: ключ с неверной длиной %zu. Ключ должен быть "
+"длины 5/13 (ASCII) или 10/26 (HEX)"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "недействительный wep-ключ: парольная фраза не может быть пустой"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr ""
+"недействительный wep-ключ: парольная фраза должна быть короче 64 символов"
+
#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
msgid "1 (Default)"
msgstr "1 (по умолчанию)"
@@ -3519,19 +3618,34 @@ msgstr "_Показать ключ"
msgid "WEP inde_x"
msgstr "_Индекс WEP"
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
+"недействительный wpa-psk: ключ неверной длины %zu. Должен быть [8,63] байт "
+"или 64 шестнадцатеричных цифр"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+"недействительный wpa-psk: невозможно интерпретировать ключ с 64 байт как "
+"шестнадцатеричный"
+
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
msgid "_Type"
msgstr "_Тип"
#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
msgid "On"
msgstr "Включено"
@@ -3568,16 +3682,17 @@ msgctxt "notifications"
msgid "Show Message C_ontent on Lock Screen"
msgstr "Показывать _подробности уведомлений на заблокированном экране"
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
-msgstr "Уведомления"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "Notifications"
+msgstr "Уведомле­ния"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
msgid "Control which notifications are displayed and what they show"
msgstr "Управление отображением и содержанием уведомлений"
#. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
msgid "Notifications;Banner;Message;Tray;Popup;"
msgstr "Уведомления;Всплывающее;Сообщение;Лоток;Всплывающее;"
@@ -3595,80 +3710,69 @@ msgstr "Уведомления на экране _блокировки"
msgid "Applications"
msgstr "Приложения"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
msgctxt "Online Account"
msgid "Other"
msgstr "Другое"
#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
#: ../panels/online-accounts/online-accounts.ui.h:2
msgid "Add Account"
msgstr "Добавление учётной записи"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
msgid "Mail"
msgstr "Почта"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+msgid "Calendar"
+msgstr "Календарь"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
msgid "Contacts"
msgstr "Контакты"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
msgid "Chat"
msgstr "Чат"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
msgid "Resources"
msgstr "Ресурсы"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "Ошибка при входе в систему под учётной записью"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "Срок действия учётных данных истёк."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-msgid "Sign in to enable this account."
-msgstr "Войдите, чтобы включить эту учётную запись."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "_Войти"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
+#: ../panels/online-accounts/cc-online-accounts-panel.c:640
msgid "Error creating account"
msgstr "Ошибка при создании учётной записи"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:700
msgid "Error removing account"
msgstr "Ошибка при удалении учётной записи"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+#: ../panels/online-accounts/cc-online-accounts-panel.c:736
msgid "Are you sure you want to remove the account?"
msgstr "Действительно удалить учётную запись?"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
+#: ../panels/online-accounts/cc-online-accounts-panel.c:738
msgid "This will not remove the account on the server."
msgstr "Это не приведёт к удалению учётной записи на сервере."
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
+#: ../panels/online-accounts/cc-online-accounts-panel.c:739
msgid "_Remove"
msgstr "_Удалить"
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
-msgstr "Сетевые учётные записи"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+msgid "Online Accounts"
+msgstr "Сете­вые учёт­ные записи"
+
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
msgid "Connect to your online accounts and decide what to use them for"
msgstr ""
"Подключиться к сетевым учётным записям и решить для чего их использовать"
#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
msgid ""
"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3681,6 +3785,7 @@ msgid "No online accounts configured"
msgstr "Нет ни одной настроенной сетевой учётной записи"
#: ../panels/online-accounts/online-accounts.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
msgid "Remove Account"
msgstr "Удалить учётную запись"
@@ -3827,7 +3932,7 @@ msgstr "Компьютер"
#. TRANSLATORS: secondary battery, misc
#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2252
+#: ../panels/power/cc-power-panel.c:2358
msgid "Battery"
msgstr "Батарея"
@@ -3875,103 +3980,104 @@ msgstr "Батареи"
msgid "When _idle"
msgstr "При п_ростое"
-#: ../panels/power/cc-power-panel.c:1640
+#: ../panels/power/cc-power-panel.c:1680
msgid "Power Saving"
msgstr "Энергосбережение"
-#: ../panels/power/cc-power-panel.c:1675
+#: ../panels/power/cc-power-panel.c:1715
msgid "_Screen brightness"
msgstr "Яркость _экрана"
-#: ../panels/power/cc-power-panel.c:1694
+#: ../panels/power/cc-power-panel.c:1734
msgid "Automatic brightness"
msgstr "Автоматическая регулировка яркости"
-#: ../panels/power/cc-power-panel.c:1714
+#: ../panels/power/cc-power-panel.c:1754
msgid "_Keyboard brightness"
msgstr "Яркость подсветки _клавиатуры"
-#: ../panels/power/cc-power-panel.c:1724
+#: ../panels/power/cc-power-panel.c:1764
msgid "_Dim screen when inactive"
msgstr "У_меньшать яркость экрана при простое"
-#: ../panels/power/cc-power-panel.c:1749
+#: ../panels/power/cc-power-panel.c:1789
msgid "_Blank screen"
msgstr "_Выключение экрана"
-#: ../panels/power/cc-power-panel.c:1786
+#: ../panels/power/cc-power-panel.c:1826
msgid "_Wi-Fi"
msgstr "_Wi-Fi"
-#: ../panels/power/cc-power-panel.c:1791
+#: ../panels/power/cc-power-panel.c:1831
msgid "Turn off Wi-Fi to save power."
msgstr "Выключите Wi-Fi для уменьшения энергопотребления."
-#: ../panels/power/cc-power-panel.c:1816
+#: ../panels/power/cc-power-panel.c:1856
msgid "_Mobile broadband"
msgstr "_Мобильный Интернет"
-#: ../panels/power/cc-power-panel.c:1821
+#: ../panels/power/cc-power-panel.c:1861
msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
msgstr ""
"Выключите адаптер мобильного широкополосного доступа (3G, 4G, WiMax и т.д.) "
"для уменьшения энергопотребления."
-#: ../panels/power/cc-power-panel.c:1873
+#: ../panels/power/cc-power-panel.c:1906
msgid "_Bluetooth"
msgstr "_Bluetooth"
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:1962
msgid "When on battery power"
msgstr "При работе от батареи"
-#: ../panels/power/cc-power-panel.c:1931
+#: ../panels/power/cc-power-panel.c:1964
msgid "When plugged in"
msgstr "При подключении"
-#: ../panels/power/cc-power-panel.c:2023
+#: ../panels/power/cc-power-panel.c:2059
msgid "Suspend"
msgstr "Перевести в режим ожидания"
-#: ../panels/power/cc-power-panel.c:2024
+#: ../panels/power/cc-power-panel.c:2060
msgid "Hibernate"
msgstr "Перевести в режим гибернации"
-#: ../panels/power/cc-power-panel.c:2025
+#: ../panels/power/cc-power-panel.c:2061
msgid "Nothing"
msgstr "Ничего не делать"
#. Frame header
-#: ../panels/power/cc-power-panel.c:2074
+#: ../panels/power/cc-power-panel.c:2175
msgid "Suspend & Power Button"
msgstr "Режим ожидания и кнопка выключения"
-#: ../panels/power/cc-power-panel.c:2115
+#: ../panels/power/cc-power-panel.c:2218
msgid "_Automatic suspend"
msgstr "_Автоматический режим ожидания"
-#: ../panels/power/cc-power-panel.c:2116
+#: ../panels/power/cc-power-panel.c:2219
msgid "Automatic suspend"
msgstr "Автоматический режим ожидания"
-#: ../panels/power/cc-power-panel.c:2180
+#: ../panels/power/cc-power-panel.c:2286
msgid "_When the Power Button is pressed"
msgstr "_При нажатии кнопки выключения"
-#: ../panels/power/cc-power-panel.c:2306
+#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270
msgid "Devices"
msgstr "Устройства"
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
-msgstr "Электропитание"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Power"
+msgstr "Электро­питание"
+
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
msgid "View your battery status and change power saving settings"
msgstr "Просмотр состояния батареи и изменение параметров энергосбережения"
#. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:4
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
msgid ""
"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
msgstr ""
@@ -4064,11 +4170,6 @@ msgstr "При работе от _батареи"
msgid "Delay"
msgstr "Задержка"
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "Отменить"
-
#: ../panels/printers/authentication-dialog.ui.h:3
msgid "Authenticate"
msgstr "Аутентификация"
@@ -4078,138 +4179,138 @@ msgid "Authentication Required"
msgstr "Требуется аутентификация"
#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:678
+#: ../panels/printers/cc-printers-panel.c:683
msgid "Low on toner"
msgstr "Мало тонера"
#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:680
+#: ../panels/printers/cc-printers-panel.c:685
msgid "Out of toner"
msgstr "Тонер закончился"
#. Translators: "Developer" is a chemical for photo development,
#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:683
+#: ../panels/printers/cc-printers-panel.c:688
msgid "Low on developer"
msgstr "Мало проявителя"
#. Translators: "Developer" is a chemical for photo development,
#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:686
+#: ../panels/printers/cc-printers-panel.c:691
msgid "Out of developer"
msgstr "Проявитель закончился"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:688
+#: ../panels/printers/cc-printers-panel.c:693
msgid "Low on a marker supply"
msgstr "Маркер скоро закончится"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:690
+#: ../panels/printers/cc-printers-panel.c:695
msgid "Out of a marker supply"
msgstr "Маркер закончился"
#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:692
+#: ../panels/printers/cc-printers-panel.c:697
msgid "Open cover"
msgstr "Открыта крышка"
#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:694
+#: ../panels/printers/cc-printers-panel.c:699
msgid "Open door"
msgstr "Открыта дверца"
#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:696
+#: ../panels/printers/cc-printers-panel.c:701
msgid "Low on paper"
msgstr "Мало бумаги"
#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:698
+#: ../panels/printers/cc-printers-panel.c:703
msgid "Out of paper"
msgstr "Бумага закончилась"
#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:700
+#: ../panels/printers/cc-printers-panel.c:705
msgctxt "printer state"
msgid "Offline"
msgstr "Выключен"
#. Translators: Someone has stopped the Printer
#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:702
-#: ../panels/printers/cc-printers-panel.c:893
+#: ../panels/printers/cc-printers-panel.c:707
+#: ../panels/printers/cc-printers-panel.c:897
msgctxt "printer state"
msgid "Stopped"
msgstr "Остановлен"
#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:704
+#: ../panels/printers/cc-printers-panel.c:709
msgid "Waste receptacle almost full"
msgstr "Резервуар почти полон"
#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:706
+#: ../panels/printers/cc-printers-panel.c:711
msgid "Waste receptacle full"
msgstr "Резервуар заполнен"
#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:708
+#: ../panels/printers/cc-printers-panel.c:713
msgid "The optical photo conductor is near end of life"
msgstr "Фотобарабан скоро выйдет из строя"
#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:710
+#: ../panels/printers/cc-printers-panel.c:715
msgid "The optical photo conductor is no longer functioning"
msgstr "Фотобарабан перестал работать"
#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:820
+#: ../panels/printers/cc-printers-panel.c:824
msgctxt "printer state"
msgid "Configuring"
msgstr "Настройка"
#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:879
+#: ../panels/printers/cc-printers-panel.c:883
msgctxt "printer state"
msgid "Ready"
msgstr "Готов"
#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:884
+#: ../panels/printers/cc-printers-panel.c:888
msgctxt "printer state"
msgid "Does not accept jobs"
msgstr "Не принимает задания"
#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:893
msgctxt "printer state"
msgid "Processing"
msgstr "Обработка"
#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1009
+#: ../panels/printers/cc-printers-panel.c:1013
msgid "Toner Level"
msgstr "Уровень тонера"
#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1012
+#: ../panels/printers/cc-printers-panel.c:1016
msgid "Ink Level"
msgstr "Уровень чернил"
#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1015
+#: ../panels/printers/cc-printers-panel.c:1019
msgid "Supply Level"
msgstr "Уровень ресурсов"
#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1033
+#: ../panels/printers/cc-printers-panel.c:1037
msgctxt "printer state"
msgid "Installing"
msgstr "Установка"
#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1541
+#: ../panels/printers/cc-printers-panel.c:1551
#, c-format
msgid "%u active"
msgid_plural "%u active"
@@ -4218,15 +4319,15 @@ msgstr[1] "%u активных"
msgstr[2] "%u активных"
#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1882
+#: ../panels/printers/cc-printers-panel.c:1892
msgid "Failed to add new printer."
msgstr "Не удалось добавить новый принтер."
-#: ../panels/printers/cc-printers-panel.c:2049
+#: ../panels/printers/cc-printers-panel.c:2073
msgid "Select PPD File"
msgstr "Выберите файл PPD"
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2082
msgid ""
"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
@@ -4234,48 +4335,45 @@ msgstr ""
"Файлы PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
-#: ../panels/printers/cc-printers-panel.c:2365
+#: ../panels/printers/cc-printers-panel.c:2389
msgid "No suitable driver found"
msgstr "Подходящий драйвер не найден"
-#: ../panels/printers/cc-printers-panel.c:2436
+#: ../panels/printers/cc-printers-panel.c:2460
msgid "Searching for preferred drivers…"
msgstr "Поиск предпочтительных драйверов…"
-#: ../panels/printers/cc-printers-panel.c:2457
+#: ../panels/printers/cc-printers-panel.c:2481
msgid "Select from database…"
msgstr "Выбрать из базы данных…"
-#: ../panels/printers/cc-printers-panel.c:2466
+#: ../panels/printers/cc-printers-panel.c:2490
msgid "Provide PPD File…"
msgstr "Использовать файл PPD…"
#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2617
-#: ../panels/printers/cc-printers-panel.c:2640
+#: ../panels/printers/cc-printers-panel.c:2637
+#: ../panels/printers/cc-printers-panel.c:2660
msgid "Test page"
msgstr "Пробная страница"
-#: ../panels/printers/cc-printers-panel.c:2753
-msgid "No printers"
-msgstr "Принтеров нет"
-
#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3099
+#: ../panels/printers/cc-printers-panel.c:3115
#, c-format
msgid "Could not load ui: %s"
msgstr "Не удалось загрузить интерфейс пользователя: %s"
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Printers"
msgstr "Принтеры"
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
msgid "Add printers, view printer jobs and decide how you want to print"
msgstr "Добавление принтеров, просмотр текущих заданий и выбор способа печати"
#. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
msgid "Printer;Queue;Print;Paper;Ink;Toner;"
msgstr "Принтер;Очередь;Печать;Бумага;Чернила;Тонер;"
@@ -4437,6 +4535,11 @@ msgstr "Последовательный порт"
msgid "Parallel Port"
msgstr "Параллельный порт"
+#. Translators: The found device is a printer connected via Bluetooth
+#: ../panels/printers/pp-new-printer-dialog.c:1676
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
#. Translators: Location of found network printer (e.g. Kitchen, Reception)
#: ../panels/printers/pp-new-printer-dialog.c:1713
#, c-format
@@ -4648,13 +4751,17 @@ msgstr "Печать п_робной страницы"
msgid "_Options"
msgstr "_Параметры"
+#: ../panels/printers/printers.ui.h:23
+msgid "No printers"
+msgstr "Принтеров нет"
+
#. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/printers.ui.h:25
msgid "Add a Printer"
msgstr "Добавить принтер"
#. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:27
msgid ""
"Sorry! The system printing service\n"
"doesn't seem to be available."
@@ -4662,70 +4769,70 @@ msgstr ""
"Системная служба печати\n"
"недоступна или не запущена."
-#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
msgid "Screen Lock"
msgstr "Блокировка экрана"
-#: ../panels/privacy/cc-privacy-panel.c:420
+#: ../panels/privacy/cc-privacy-panel.c:438
msgid "In use"
msgstr "Используется"
-#: ../panels/privacy/cc-privacy-panel.c:425
+#: ../panels/privacy/cc-privacy-panel.c:443
msgctxt "Location services status"
msgid "On"
msgstr "Включено"
-#: ../panels/privacy/cc-privacy-panel.c:426
+#: ../panels/privacy/cc-privacy-panel.c:444
msgctxt "Location services status"
msgid "Off"
msgstr "Выключено"
-#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
msgid "Location Services"
msgstr "Сервисы местоположения"
-#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
msgid "Usage & History"
msgstr "Статистика и история"
-#: ../panels/privacy/cc-privacy-panel.c:1001
+#: ../panels/privacy/cc-privacy-panel.c:1067
msgid "Empty all items from Trash?"
msgstr "Удалить все объекты из корзины?"
-#: ../panels/privacy/cc-privacy-panel.c:1002
+#: ../panels/privacy/cc-privacy-panel.c:1068
msgid "All items in the Trash will be permanently deleted."
msgstr "Все объекты корзины будут безвозвратно удалены."
-#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
msgid "_Empty Trash"
msgstr "_Очистить корзину"
-#: ../panels/privacy/cc-privacy-panel.c:1026
+#: ../panels/privacy/cc-privacy-panel.c:1092
msgid "Delete all the temporary files?"
msgstr "Удалить все временные файлы?"
-#: ../panels/privacy/cc-privacy-panel.c:1027
+#: ../panels/privacy/cc-privacy-panel.c:1093
msgid "All the temporary files will be permanently deleted."
msgstr "Все временные файлы будут безвозвратно удалены."
-#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
msgid "_Purge Temporary Files"
msgstr "_Удалить временные файлы"
-#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
msgid "Purge Trash & Temporary Files"
msgstr "Очистка корзины и временные файлы"
-#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
msgid "Software Usage"
msgstr "Использование ПО"
-#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
msgid "Problem Reporting"
msgstr "Сообщение об ошибках"
#. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1145
+#: ../panels/privacy/cc-privacy-panel.c:1211
#, c-format
msgid ""
"Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4734,20 +4841,22 @@ msgstr ""
"Отправка сообщения о технических проблемах помогает нам улучшить %s. Отчеты "
"отправляются анонимно и не содержат персональных данных."
-#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
msgid "Privacy Policy"
msgstr "Политика конфиденциальности"
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
-msgstr "Конфиденциальность"
-
+# По ссылке не совсем ясно как вставлять переносы, пока ставлю как ­
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Privacy"
+msgstr "Конфиден­циаль­ность"
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
msgid "Protect your personal information and control what others might see"
msgstr "Управление конфиденциальностью"
#. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
msgid ""
"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
"network;identity;"
@@ -4922,21 +5031,21 @@ msgctxt "Input Source"
msgid "Other"
msgstr "Другое"
-#: ../panels/region/cc-region-panel.c:248
-#: ../panels/user-accounts/um-user-panel.c:1069
+#: ../panels/region/cc-region-panel.c:247
+#: ../panels/user-accounts/um-user-panel.c:1087
msgid "Your session needs to be restarted for changes to take effect"
msgstr "Необходимо перезапустить сеанс, чтобы изменения вступили в силу"
-#: ../panels/region/cc-region-panel.c:252
-#: ../panels/user-accounts/um-user-panel.c:1073
+#: ../panels/region/cc-region-panel.c:251
+#: ../panels/user-accounts/um-user-panel.c:1091
msgid "Restart Now"
msgstr "Перезапустить сейчас"
-#: ../panels/region/cc-region-panel.c:889
+#: ../panels/region/cc-region-panel.c:888
msgid "No input source selected"
msgstr "Не выбран источник ввода"
-#: ../panels/region/cc-region-panel.c:1807
+#: ../panels/region/cc-region-panel.c:1779
msgid "Login _Screen"
msgstr "_Экран входа"
@@ -4968,18 +5077,19 @@ msgstr "Система мер"
msgid "Paper"
msgstr "Бумага"
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Region & Language"
msgstr "Язык и регион"
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
msgid ""
"Select your display language, formats, keyboard layouts and input sources"
msgstr ""
"Выбор языка интерфейса, форматов, раскладки клавиатуры и источников ввода"
#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
msgid "Language;Layout;Keyboard;Input;"
msgstr "Язык;Раскладка;Клавиатура;Ввод;"
@@ -5036,7 +5146,7 @@ msgid "Left+Right Alt"
msgstr "Левый+Правый Alt"
#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
msgid "_Language"
msgstr "_Язык"
@@ -5084,26 +5194,11 @@ msgstr "Показать раскладку источника ввода"
msgid "Login settings are used by all users when logging into the system"
msgstr "Параметры входа в систему используются всеми пользователями"
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "Места"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "Закладки"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "Другое"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:634
msgid "Select Location"
msgstr "Выберите расположение"
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:638
msgid "_OK"
msgstr "_ОК"
@@ -5111,17 +5206,18 @@ msgstr "_ОК"
msgid "No applications found"
msgstr "Приложения не найдены"
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
msgid "Search"
msgstr "Поиск"
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
msgid ""
"Control which applications show search results in the Activities Overview"
msgstr "Какие приложения показывают результаты поиска в режиме «Обзор»"
#. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
msgid "Search;Find;Index;Hide;Privacy;Results;"
msgstr "Поиск;Найти;Индекс;Скрыть;Конфиденциальность;Результаты;"
@@ -5129,6 +5225,18 @@ msgstr "Поиск;Найти;Индекс;Скрыть;Конфиденциал
msgid "Search Locations"
msgstr "Места поиска"
+#: ../panels/search/search-locations-dialog.ui.h:2
+msgid "Places"
+msgstr "Места"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+msgid "Other"
+msgstr "Другое"
+
#: ../panels/search/search.ui.h:1
msgid "Move Up"
msgstr "Поднять"
@@ -5141,6 +5249,11 @@ msgstr "Опустить"
msgid "Preferences"
msgstr "Настройки"
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+msgid "No networks selected for sharing"
+msgstr "Не выбрано ни одной сети для обеспечения общего доступа"
+
#: ../panels/sharing/cc-sharing-panel.c:263
msgctxt "service is enabled"
msgid "On"
@@ -5166,21 +5279,60 @@ msgstr "Запущено"
msgid "Choose a Folder"
msgstr "Выберите папку"
-#: ../panels/sharing/cc-sharing-panel.c:798
+#: ../panels/sharing/cc-sharing-panel.c:680
+#, c-format
+msgid ""
+"Personal File Sharing allows you to share your Public folder with others on "
+"your current network using: <a href=\"dav://%s\">dav://%s</a>"
+msgstr ""
+"Общий доступ к файлам позволяет открыть доступ к папкам для других "
+"пользователей сети с помощью: <a href=\"dav://%s\">dav://%s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:682
+#, c-format
+#| msgid ""
+#| "Allow remote users to connect using the Secure Shell command:\n"
+#| "<a href=\"ssh %s\">ssh %s</a>"
+msgid ""
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"При включённом удалённом входе, удалённые пользователи могут подключаться "
+"используя команду Secure Shell:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:684
+#, c-format
+#| msgid ""
+#| "Allow remote users to view or control your screen by connecting to: <a "
+#| "href=\"vnc://%s\">vnc://%s</a>"
+msgid ""
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr ""
+"Общий доступ к экрану позволяет удалённым пользователям просматривать и "
+"управлять вашим экраном, подключившись к <a href=\"vnc://%s\">vnc://%s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:796
msgid "Copy"
msgstr "Копировать"
-#: ../panels/sharing/cc-sharing-panel.c:1124
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#: ../panels/sharing/cc-sharing-panel.c:1122
msgid "Sharing"
msgstr "Общий доступ"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Sharing"
+msgstr "Общий доступ"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
msgid "Control what you want to share with others"
msgstr "Общий доступ для других пользователей"
#. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
msgid ""
"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
"movies;server;renderer;"
@@ -5188,6 +5340,10 @@ msgstr ""
"общий;доступ;ssh;узел;имя;удалённый;рабочий;стол;медиа;аудио;видео;"
"изображения;фото;фильмы;сервер;обработчик;"
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "Сети"
+
#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
msgid "Enable or disable remote login"
msgstr "Включение или отключение удалённого входа в систему"
@@ -5198,24 +5354,12 @@ msgstr ""
"Для включения или выключения удалённого доступа необходимо выполнить "
"проверку подлинности"
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-msgid "No networks selected for sharing"
-msgstr "Не выбрано ни одной сети для обеспечения общего доступа"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "Сети"
-
#: ../panels/sharing/sharing.ui.h:1
msgid "_Computer Name"
msgstr "Имя _компьютера"
#: ../panels/sharing/sharing.ui.h:2
-msgid "_Personal File Sharing"
+msgid "_File Sharing"
msgstr "Общий доступ к _файлам"
#: ../panels/sharing/sharing.ui.h:3
@@ -5235,84 +5379,54 @@ msgid "Some services are disabled because of no network access."
msgstr "Некоторые службы отключены из-за отсутствия доступа к сети."
#: ../panels/sharing/sharing.ui.h:7
-msgid "Personal File Sharing"
+msgid "File Sharing"
msgstr "Общий доступ к файлам"
-#: ../panels/sharing/sharing.ui.h:9
-#, no-c-format
-msgid ""
-"Personal File Sharing allows you to share your Public folder with others on "
-"your current network using: <a href=\"dav://%s\">dav://%s</a>"
-msgstr ""
-"Общий доступ к файлам позволяет открыть доступ к папкам для других "
-"пользователей сети с помощью: <a href=\"dav://%s\">dav://%s</a>"
-
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:8
msgid "_Require Password"
msgstr "_Требовать пароль"
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:10
msgid "Remote Login"
msgstr "Удалённая авторизация"
-#: ../panels/sharing/sharing.ui.h:14
-#, no-c-format
-msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-msgstr ""
-"Позволить удалённым пользователям подключаться, используя команду SSH:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-
-#: ../panels/sharing/sharing.ui.h:16
+#: ../panels/sharing/sharing.ui.h:11
msgid "Screen Sharing"
msgstr "Общий доступ к экрану"
-#: ../panels/sharing/sharing.ui.h:18
-#, no-c-format
-msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
-msgstr ""
-"Разрешить удалённым пользователям просматривать и управлять вашим экраном, "
-"подключившись к: <a href=\"vnc://%s\">vnc://%s</a>"
-
-#: ../panels/sharing/sharing.ui.h:19
-msgid "_Allow Remote Control"
-msgstr "_Разрешить удалённое управление"
+#: ../panels/sharing/sharing.ui.h:12
+msgid "_Allow connections to control the screen"
+msgstr "_Разрешить соединения для управления экраном"
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:13
msgid "_Password:"
msgstr "_Пароль:"
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:14
msgid "_Show Password"
msgstr "П_оказать пароль"
-#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/sharing/sharing.ui.h:15
msgid "Access Options"
msgstr "Параметры доступа"
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:16
msgid "_New connections must ask for access"
msgstr "_Новые подключения должны запрашивать доступ"
-#: ../panels/sharing/sharing.ui.h:24
+#: ../panels/sharing/sharing.ui.h:17
msgid "_Require a password"
msgstr "_Требовать пароль"
-#: ../panels/sharing/sharing.ui.h:25
+#: ../panels/sharing/sharing.ui.h:18
msgid "Media Sharing"
msgstr "Общий доступ к мультимедиа"
-#: ../panels/sharing/sharing.ui.h:26
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr ""
-"Общий доступ к мультимедиа позволяет открыть доступ к музыке, фото и видео "
-"по сети."
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share music, photos and videos over the network."
+msgstr "Общий доступ к музыке, фото и видео по сети."
-#: ../panels/sharing/sharing.ui.h:27
+#: ../panels/sharing/sharing.ui.h:20
msgid "Folders"
msgstr "Папки"
@@ -5443,11 +5557,6 @@ msgstr "_Проверить динамики"
msgid "Peak detect"
msgstr "Пиковый детектор"
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "Название"
-
#: ../panels/sound/gvc-mixer-dialog.c:1512
msgid "Device"
msgstr "Устройство"
@@ -5543,18 +5652,23 @@ msgstr "Проверить"
msgid "Subwoofer"
msgstr "Сабвуфер"
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
msgid "Custom"
msgstr "Другой"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+msgid "Universal Access"
+msgstr "Универсаль­ный доступ"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
msgid "Make it easier to see, hear, type, point and click"
msgstr ""
"Упрощение ввода, наведения и нажатия, а также улучшение видимости и "
"слышимости"
#. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
msgid ""
"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
@@ -5654,8 +5768,8 @@ msgid "Sound Keys"
msgstr "Озвучивание клавиши"
#: ../panels/universal-access/uap.ui.h:25
-msgid "Beep when Num Lock or Caps Lock are turned on."
-msgstr "Подавать сигнал при включении Num Lock или Caps Lock."
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
+msgstr "Подавать сигнал при нажатии Num Lock или Caps Lock."
#: ../panels/universal-access/uap.ui.h:26
msgid "Visual Alerts"
@@ -6036,96 +6150,78 @@ msgid "Color Effects"
msgstr "Цветовые эффекты"
#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "Добавить пользователя"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "_Full Name"
+msgstr "_Полное имя"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
msgid "Standard"
msgstr "Обычный"
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
msgid "Administrator"
msgstr "Администратор"
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Full Name"
-msgstr "_Полное имя"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
msgid "Account _Type"
msgstr "_Тип учётной записи"
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
msgid "Allow user to set a password when they next _login"
msgstr ""
"_Разрешить пользователю установить пароль при следующем входе с систему"
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
msgid "Set a password _now"
msgstr "_Установите пароль сейчас"
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "_Проверить"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "_Confirm"
+msgstr "_Подтвердить"
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#| msgid ""
+#| "Enterprise login allows an existing centrally managed user account to be "
+#| "used on this device."
msgid ""
"Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
msgstr ""
"Корпоративный вход в систему позволяет использовать существующую управляемую "
-"централизованно учётную запись пользователя на этом устройстве."
+"централизованно учётную запись пользователя на этом устройстве. Также можно "
+"использовать данную учётную запись для доступа к ресурсам компании в "
+"интернете."
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
msgid "_Domain"
msgstr "_Домен"
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-"Выйдите в сеть, чтобы добавить\n"
-"корпоративные учётные записи."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "_Корпоративный вход"
-
#: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "Добавить пользователя"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
-msgid "_Enroll"
-msgstr "_Зарегистрировать"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "Вход для администратора домена"
+#| msgctxt "printer state"
+#| msgid "Offline"
+msgid "You are Offline"
+msgstr "Сетевое подключение отсутствует"
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#| msgid ""
+#| "Go online to add\n"
+#| "enterprise login accounts."
+msgid "You must be online in order to add enterprise users."
msgstr ""
-"Для использования корпоративного входа этот компьютер необходимо\n"
-"внести в домен. Попросите системного администратора ввести сюда\n"
-"пароль домена."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "_Имя администратора"
+"Для добавления корпоративных учётных записей требуется подключение к сети."
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "Пароль администратора"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "_Корпоративный вход"
#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
msgid "Left thumb"
@@ -6160,7 +6256,7 @@ msgid "Right little finger"
msgstr "Правый мизинец"
#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:686
+#: ../panels/user-accounts/um-fingerprint-dialog.c:687
msgid "Enable Fingerprint Login"
msgstr "Включить вход в систему по отпечатку"
@@ -6197,9 +6293,32 @@ msgstr "Добавить или удалить пользователей или
msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
msgstr "Вход;Имя;Отпечаток;Аватар;Логотип;Лицо;Пароль;"
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "Журнал входа в систему"
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "_Зарегистрировать"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "Вход для администратора домена"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"Для использования корпоративного входа этот компьютер необходимо\n"
+"внести в домен. Попросите системного администратора ввести сюда\n"
+"пароль домена."
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "_Имя администратора"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "Пароль администратора"
#: ../panels/user-accounts/data/password-dialog.ui.h:1
msgid "Change Password"
@@ -6222,38 +6341,30 @@ msgid "Current _Password"
msgstr "Текущий па_роль"
#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to set a password when they next login"
-msgstr "Разрешить пользователю установить пароль при следующем входе с систему"
+msgid "Allow user to change their password on next login"
+msgstr "Разрешить пользователю изменить пароль при следующем входе с систему"
#: ../panels/user-accounts/data/password-dialog.ui.h:8
msgid "Set a password now"
msgstr "Установите пароль сейчас"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "Добавить учётную запись пользователя"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Remove User Account"
-msgstr "Удалить учётную запись пользователя"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+msgid "_Add User…"
+msgstr "_Добавить пользователя…"
#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "Параметры входа в систему"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
msgid "A_utomatic Login"
msgstr "Автоматический в_ход"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
msgid "_Fingerprint Login"
msgstr "_Вход по отпечатку"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
msgid "User Icon"
msgstr "Значок пользователя"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
msgid "Last Login"
msgstr "Последний вход"
@@ -6358,7 +6469,7 @@ msgstr "Попробуйте добавить ещё буквы, цифры и
#: ../panels/user-accounts/pw-utils.c:117
msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
+msgid "Mix uppercase and lowercase and try to use a number or two."
msgstr "Смешайте заглавные и строчные буквы несколько раз."
#: ../panels/user-accounts/pw-utils.c:119
@@ -6450,32 +6561,33 @@ msgid "Unknown error"
msgstr "Неизвестная ошибка"
#: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
-msgstr "Веб-адрес должен совпадать с адресом провайдера вашей учётной записи."
+#| msgid "Should match the web address of your account provider."
+msgid "Should match the web address of your login provider."
+msgstr "Должно совпадать с веб-адресом провайдера вашей учётной записи."
#: ../panels/user-accounts/um-account-dialog.c:228
msgid "Failed to add account"
msgstr "Не удалось добавить учётную запись"
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:448
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:702
+#: ../panels/user-accounts/um-account-dialog.c:748
+#: ../panels/user-accounts/um-account-dialog.c:769
msgid "Failed to register account"
msgstr "Не удалось зарегистрировать учётную запись"
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:892
msgid "No supported way to authenticate with this domain"
msgstr "Нет поддерживаемого метода аутентификации в этом домене"
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:965
msgid "Failed to join domain"
msgstr "Не удалось подключить к домену"
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1026
msgid ""
"That login name didn't work.\n"
"Please try again."
@@ -6483,7 +6595,7 @@ msgstr ""
"Неправильное имя пользователя.\n"
"Попробуйте ещё раз."
-#: ../panels/user-accounts/um-account-dialog.c:1050
+#: ../panels/user-accounts/um-account-dialog.c:1033
msgid ""
"That login password didn't work.\n"
"Please try again."
@@ -6491,14 +6603,24 @@ msgstr ""
"Неправильный пароль.\n"
"Попробуйте ещё раз."
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1041
msgid "Failed to log into domain"
msgstr "Не удалось войти в домен"
-#: ../panels/user-accounts/um-account-dialog.c:1116
+#: ../panels/user-accounts/um-account-dialog.c:1099
msgid "Unable find the domain. Maybe you misspelled it?"
msgstr "Не удалось найти домен. Может быть, он написан с ошибкой?"
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "Обычный"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "Администратор"
+
#: ../panels/user-accounts/um-fingerprint-dialog.c:138
msgid ""
"You are not allowed to access the device. Contact your system administrator."
@@ -6517,30 +6639,30 @@ msgstr "Произошла внутренняя ошибка."
msgid "Enabled"
msgstr "Включено"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
msgid "Delete registered fingerprints?"
msgstr "Удалить зарегистрированные отпечатки?"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
msgid "_Delete Fingerprints"
msgstr "_Удалить отпечатки"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: ../panels/user-accounts/um-fingerprint-dialog.c:274
msgid ""
"Do you want to delete your registered fingerprints so fingerprint login is "
"disabled?"
msgstr ""
"Удалить зарегистрированные отпечатки пальцев и запретить доступ по отпечатку?"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: ../panels/user-accounts/um-fingerprint-dialog.c:444
msgid "Done!"
msgstr "Выполнено!"
#. translators:
#. * The variable is the name of the device, for example:
#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: ../panels/user-accounts/um-fingerprint-dialog.c:505
+#: ../panels/user-accounts/um-fingerprint-dialog.c:547
#, c-format
msgid "Could not access '%s' device"
msgstr "Не удалось получить доступ к устройству «%s»"
@@ -6548,16 +6670,16 @@ msgstr "Не удалось получить доступ к устройств
#. translators:
#. * The variable is the name of the device, for example:
#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:587
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
#, c-format
msgid "Could not start finger capture on '%s' device"
msgstr "Не удалось снять отпечаток с устройства «%s»"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:638
msgid "Could not access any fingerprint readers"
msgstr "Не удалось получить доступ к устройствам сканирования отпечатков"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
msgid "Please contact your system administrator for help."
msgstr "Для получения помощи свяжитесь с системным администратором."
@@ -6566,7 +6688,7 @@ msgstr "Для получения помощи свяжитесь с систе
#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
#. * 'Digital Persona U.are.U 4000/4000B' device."
#.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:720
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
#, c-format
msgid ""
"To enable fingerprint login, you need to save one of your fingerprints, "
@@ -6575,11 +6697,11 @@ msgstr ""
"Чтобы включить вход по отпечатку пальца, необходимо снять один или несколько "
"образцов, используя устройство «%s»."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:727
+#: ../panels/user-accounts/um-fingerprint-dialog.c:728
msgid "Selecting finger"
msgstr "Выбор пальца"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
msgid "Enrolling fingerprints"
msgstr "Регистрация отпечатков пальцев"
@@ -6634,14 +6756,21 @@ msgctxt "login date-time"
msgid "%s, %s"
msgstr "%s, %s"
-#: ../panels/user-accounts/um-history-dialog.c:249
+#: ../panels/user-accounts/um-history-dialog.c:250
msgid "Session Ended"
msgstr "Сеанс завершён"
-#: ../panels/user-accounts/um-history-dialog.c:255
+#: ../panels/user-accounts/um-history-dialog.c:256
msgid "Session Started"
msgstr "Сеанс начат"
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s - Account Activity"
+msgstr "%s — активность учётной записи"
+
#: ../panels/user-accounts/um-password-dialog.c:145
msgid "Please choose another password."
msgstr "Выберите другой пароль."
@@ -6703,7 +6832,7 @@ msgstr "Неправильный пароль, попробуйте ещё ра
msgid "Couldn't connect to the %s domain: %s"
msgstr "Не удалось подключиться к домену %s: %s"
-#: ../panels/user-accounts/um-user-panel.c:237
+#: ../panels/user-accounts/um-user-panel.c:239
msgid "Other Accounts"
msgstr "Другие учётные записи"
@@ -6783,15 +6912,15 @@ msgstr "Нет"
msgid "Logged in"
msgstr "Авторизованный"
-#: ../panels/user-accounts/um-user-panel.c:1272
+#: ../panels/user-accounts/um-user-panel.c:1290
msgid "Failed to contact the accounts service"
msgstr "Не удалось связаться со службой учётных записей"
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1292
msgid "Please make sure that the AccountService is installed and enabled."
msgstr "Убедитесь, что AccountService установлен и включён."
-#: ../panels/user-accounts/um-user-panel.c:1315
+#: ../panels/user-accounts/um-user-panel.c:1334
msgid ""
"To make changes,\n"
"click the * icon first"
@@ -6799,12 +6928,12 @@ msgstr ""
"Чтобы изменить,\n"
"сначала нажмите на значок *"
-#: ../panels/user-accounts/um-user-panel.c:1353
+#: ../panels/user-accounts/um-user-panel.c:1374
msgid "Create a user account"
msgstr "Создать учётную запись пользователя"
-#: ../panels/user-accounts/um-user-panel.c:1364
-#: ../panels/user-accounts/um-user-panel.c:1676
+#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1677
msgid ""
"To create a user account,\n"
"click the * icon first"
@@ -6812,12 +6941,12 @@ msgstr ""
"Чтобы создать учётную запись пользователя,\n"
"сначала нажмите на значок *"
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1395
msgid "Delete the selected user account"
msgstr "Удалить выбранную учётную запись пользователя"
-#: ../panels/user-accounts/um-user-panel.c:1386
-#: ../panels/user-accounts/um-user-panel.c:1681
+#: ../panels/user-accounts/um-user-panel.c:1407
+#: ../panels/user-accounts/um-user-panel.c:1682
msgid ""
"To delete the selected user account,\n"
"click the * icon first"
@@ -6825,33 +6954,35 @@ msgstr ""
"Чтобы удалить выбранную учётную запись пользователя,\n"
"сначала нажмите на значок *"
-#: ../panels/user-accounts/um-user-panel.c:1590
+#: ../panels/user-accounts/um-user-panel.c:1591
msgid "My Account"
msgstr "Моя учётная запись"
#: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "Пользователь с именем «%s» уже существует."
+msgid "Sorry, that user name isn't available. Please try another."
+msgstr "Данное имя пользователя не доступно. Попробуйте ввести другое."
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:566
#, c-format
msgid "The username is too long."
msgstr "Имя пользователя слишком длинное."
-#: ../panels/user-accounts/um-utils.c:570
+#: ../panels/user-accounts/um-utils.c:569
msgid "The username cannot start with a '-'."
msgstr "Имя пользователя не может начинаться с символа «-»."
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:572
+#| msgid ""
+#| "The username should only consist of lower and upper case letters from a-"
+#| "z, digits and any of characters '.', '-' and '_'."
msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
msgstr ""
-"Имя пользователя может состоять из букв латинского алфавита в верхнем и "
-"нижнем регистре, цифр и символов «.», «-», «_»."
+"Имя пользователя может состоять только из букв латинского алфавита в верхнем "
+"и нижнем регистре, цифр и следующих символов: . - _"
-#: ../panels/user-accounts/um-utils.c:577
+#: ../panels/user-accounts/um-utils.c:576
msgid "This will be used to name your home folder and can't be changed."
msgstr ""
"Используется для именования вашей домашней папки и не может быть изменено."
@@ -6942,19 +7073,19 @@ msgstr "Отображение на экран"
msgid "Button"
msgstr "Кнопка"
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+msgid "Wacom Tablet"
msgstr "Планшет Wacom"
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
msgstr ""
"Установка отображения кнопок и настройка чувствительности пера для "
"графических планшетов"
#. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
msgstr "Планшет;Wacom;Перо;Ластик;Мышь;"
@@ -6986,6 +7117,10 @@ msgstr "Подключите или включите планшет Wacom"
msgid "Bluetooth Settings"
msgstr "Параметры Bluetooth"
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "Планшет Wacom"
+
#: ../panels/wacom/gnome-wacom-properties.ui.h:10
msgid "Map to Monitor…"
msgstr "Отображение на экран…"
@@ -7079,22 +7214,22 @@ msgstr "Переключение режима правой сенсорной п
msgid "Mode Switch #%d"
msgstr "Переключение режима #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1300
+#: ../panels/wacom/gsd-wacom-device.c:1238
#, c-format
msgid "Left Button #%d"
msgstr "Левая кнопка #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1303
+#: ../panels/wacom/gsd-wacom-device.c:1241
#, c-format
msgid "Right Button #%d"
msgstr "Правая кнопка #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1306
+#: ../panels/wacom/gsd-wacom-device.c:1244
#, c-format
msgid "Top Button #%d"
msgstr "Верхняя кнопка #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1309
+#: ../panels/wacom/gsd-wacom-device.c:1247
#, c-format
msgid "Bottom Button #%d"
msgstr "Нижняя кнопка #%d"
@@ -7173,6 +7308,11 @@ msgstr "Нижняя кнопка"
msgid "Tip Pressure Feel"
msgstr "Чувствительность нажатия пера"
+#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "Все параметры"
+
#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
msgid "GNOME Control Center"
msgstr "Центр управления GNOME"
@@ -7229,22 +7369,18 @@ msgstr "Справка"
msgid "Quit"
msgstr "Завершить"
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495
-msgid "All Settings"
-msgstr "Все параметры"
-
#. Add categories
-#: ../shell/cc-window.c:881
+#: ../shell/cc-window.c:871
msgctxt "category"
msgid "Personal"
msgstr "Персональные"
-#: ../shell/cc-window.c:882
+#: ../shell/cc-window.c:872
msgctxt "category"
msgid "Hardware"
msgstr "Оборудование"
-#: ../shell/cc-window.c:883
+#: ../shell/cc-window.c:873
msgctxt "category"
msgid "System"
msgstr "Система"
@@ -7283,6 +7419,183 @@ msgctxt "shortcut window"
msgid "Cancel search"
msgstr "Отменить поиск"
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Точка доступа"
+
+#~ msgid "Color"
+#~ msgstr "Цвет"
+
+#~ msgid "_Name:"
+#~ msgstr "_Название:"
+
+#~ msgid "Remove Shortcut"
+#~ msgstr "Удалить комбинацию клавиш"
+
+#~ msgid ""
+#~ "To edit a shortcut, click the row and hold down the new keys or press "
+#~ "Backspace to clear."
+#~ msgstr ""
+#~ "Чтобы изменить комбинацию клавиш, нажмите на строку и зажмите новые "
+#~ "клавиши; для очистки нажмите Backspace."
+
+#~ msgid "<Unknown Action>"
+#~ msgstr "<Неизвестное действие>"
+
+#~ msgid ""
+#~ "The shortcut \"%s\" cannot be used because it will become impossible to "
+#~ "type using this key.\n"
+#~ "Please try with a key such as Control, Alt or Shift at the same time."
+#~ msgstr ""
+#~ "Нельзя использовать комбинацию «%s», поскольку набор с использованием "
+#~ "этой клавиши станет невозможным.\n"
+#~ "Попробуйте клавиши Control, Alt или Shift одновременно."
+
+#~ msgid ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "Комбинация клавиш «%s» уже используется для\n"
+#~ "«%s»"
+
+#~ msgid ""
+#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
+#~ "disabled."
+#~ msgstr ""
+#~ "После переопределения комбинации на «%s», комбинация «%s» будет выключена."
+
+#~ msgid "_Reassign"
+#~ msgstr "_Переопределить"
+
+#~ msgid ""
+#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
+#~ "automatically set it to \"%s\"?"
+#~ msgstr "Комбинация «%s» используется для «%s». Переопределить её для «%s»?"
+
+#~ msgid ""
+#~ "\"%s\" is currently associated with \"%s\", this shortcut will be "
+#~ "disabled if you move forward."
+#~ msgstr ""
+#~ "Комбинация «%s» сейчас используется для «%s», эта комбинация будет "
+#~ "выключена."
+
+#~ msgid "_Assign"
+#~ msgstr "_Назначить"
+
+# см. network-manager-applet
+#~ msgid "Bond"
+#~ msgstr "Агрегированное (Bond)"
+
+# см. network-manager-applet
+#~ msgid "Team"
+#~ msgstr "Агрегированное (Team)"
+
+#~ msgid "Bridge"
+#~ msgstr "Мост"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "Не удалось загрузить модули VPN"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "Добавить сетевое подключение"
+
+# см. network-manager-applet
+#~ msgid "Bond slaves"
+#~ msgstr "Слейвы агрегированного соединения (Bond)"
+
+#~ msgid "(none)"
+#~ msgstr "(нет)"
+
+# см. network-manager-applet
+#~ msgid "Bridge slaves"
+#~ msgstr "Слейвы сетевого моста"
+
+#~ msgid "Team slaves"
+#~ msgstr "Слейвы агрегированного соединения (Team)"
+
+#~ msgid "InfiniBand device does not support connected mode"
+#~ msgstr "Устройство InfiniBand не поддерживает режим подключения"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Сертификат центра сертификации не выбран"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Если вы не используете сертификат центра сертификации, это может привести "
+#~ "к проблемам безопасности. Хотите выбрать сертификат центра сертификации?"
+
+#~ msgid "Ignore"
+#~ msgstr "Игнорировать"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Выбрать сертификат ЦС"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "_Спрашивать каждый раз этот пароль"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "Больше не предупреждать"
+
+#~ msgid "No"
+#~ msgstr "Нет"
+
+#~ msgid "Yes"
+#~ msgstr "Да"
+
+#~ msgid "Error logging into the account"
+#~ msgstr "Ошибка при входе в систему под учётной записью"
+
+#~ msgid "Credentials have expired."
+#~ msgstr "Срок действия учётных данных истёк."
+
+#~ msgid "Sign in to enable this account."
+#~ msgstr "Войдите, чтобы включить эту учётную запись."
+
+#~ msgid "_Sign In"
+#~ msgstr "_Войти"
+
+#~ msgid "Power"
+#~ msgstr "Электропитание"
+
+#~ msgid "Privacy"
+#~ msgstr "Конфиденциальность"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "Другое"
+
+#~ msgid "Personal File Sharing"
+#~ msgstr "Общий доступ к файлам"
+
+#~ msgid "_Allow Remote Control"
+#~ msgstr "_Разрешить удалённое управление"
+
+#~ msgid "_Verify"
+#~ msgstr "_Проверить"
+
+#~ msgid "Login History"
+#~ msgstr "Журнал входа в систему"
+
+#~ msgid "Add User Account"
+#~ msgstr "Добавить учётную запись пользователя"
+
+#~ msgid "Remove User Account"
+#~ msgstr "Удалить учётную запись пользователя"
+
+#~ msgid "Login Options"
+#~ msgstr "Параметры входа в систему"
+
+#~ msgid "A user with the username '%s' already exists."
+#~ msgstr "Пользователь с именем «%s» уже существует."
+
#~ msgid "Used to determine your geographical location"
#~ msgstr "Используется для определения вашего географического местоположения"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
