[gnome-control-center] Updated Russian translation
- From: Yuri Myasoedov <ymyasoedov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] Updated Russian translation
- Date: Thu, 24 Aug 2017 18:09:42 +0000 (UTC)
commit 09d4626d19844adbd92767480b96336956dc4b1b
Author: Yuri Myasoedov <ymyasoedov yandex ru>
Date: Thu Aug 24 22:09:28 2017 +0400
Updated Russian translation
po/ru.po | 2273 +++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 1284 insertions(+), 989 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index e22d9e6..694e21a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,15 +17,16 @@
# Mihail Gurin <mikegurin yandex ru>, 2015.
# Yuri Myasoedov <ymyasoedov yandex ru>, 2012, 2014, 2015.
# Stas Solovey <whats_up tut by>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Ivan Komaritsyn <vantu5z mail ru>, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-23 16:18+0000\n"
-"PO-Revision-Date: 2017-03-29 23:45+0300\n"
-"Last-Translator: Stas Solovey <whats_up tut by>\n"
+"POT-Creation-Date: 2017-08-23 16:37+0000\n"
+"PO-Revision-Date: 2017-08-24 22:09+0400\n"
+"Last-Translator: Yuri Myasoedov <ymyasoedov yandex ru>\n"
"Language-Team: Русский <gnome-cyr gnome org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -33,7 +34,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.2\n"
#: ../panels/background/background.ui.h:1
msgid "_Background"
@@ -79,73 +80,73 @@ msgctxt "background, style"
msgid "Span"
msgstr "Вместить"
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
msgid "Wallpapers"
msgstr "Обои"
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
msgid "Colors"
msgstr "Цвета"
#. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:476
msgid "Select Background"
msgstr "Выбор фона"
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
msgid "Pictures"
msgstr "Изображения"
#. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:536
msgid "No Pictures Found"
msgstr "Изображения не найдены"
#. translators: "Home" is used in place of the Pictures
#. * directory in the string below when XDG_PICTURES_DIR is
#. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
+#: ../panels/background/cc-background-chooser-dialog.c:554
#: ../panels/search/cc-search-locations-dialog.c:302
msgid "Home"
msgstr "Домашняя папка"
#. translators: %s here is the name of the Pictures directory, the string should be translated in
#. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: ../panels/background/cc-background-chooser-dialog.c:566
#, c-format
msgid "You can add images to your %s folder and they will show up here"
msgstr "Можно добавить изображения в папку %s и они будут показаны здесь"
-#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/background/cc-background-chooser-dialog.c:573
#: ../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:1580
-#: ../panels/display/cc-display-panel.c:2226
+#: ../panels/display/cc-display-panel.c:2714
#: ../panels/network/connection-editor/connection-editor.ui.h:1
#: ../panels/network/connection-editor/vpn-helpers.c:181
#: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1346
-#: ../panels/network/net-device-wifi.c:1585
+#: ../panels/network/net-device-wifi.c:1318
+#: ../panels/network/net-device-wifi.c:1398
+#: ../panels/network/net-device-wifi.c:1633
#: ../panels/network/network-wifi.ui.h:1
#: ../panels/printers/new-printer-dialog.ui.h:3
#: ../panels/printers/pp-details-dialog.c:319
#: ../panels/privacy/cc-privacy-panel.c:1049
#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
+#: ../panels/search/cc-search-locations-dialog.c:642
#: ../panels/sharing/cc-sharing-panel.c:375
#: ../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-fingerprint-dialog.c:264
#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-photo-dialog.c:221
#: ../panels/user-accounts/um-user-panel.c:644
#: ../panels/user-accounts/um-user-panel.c:662
msgid "_Cancel"
msgstr "_Отменить"
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:574
msgid "_Select"
msgstr "_Выбрать"
@@ -182,39 +183,39 @@ msgstr "Изменить фоновое изображение на обои и
msgid "Wallpaper;Screen;Desktop;"
msgstr "Обои;Экран;Рабочий;"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
msgid "Turn Off Airplane Mode"
msgstr "Выключить режим для _авиаперелётов"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
msgid "No Bluetooth Found"
msgstr "Адаптеры Bluetooth не найдены"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
msgid "Plug in a dongle to use Bluetooth."
msgstr "Для использования Bluetooth подключите адаптер."
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
msgid "Bluetooth Turned Off"
msgstr "Адаптер Bluetooth выключен"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
msgid "Turn on to connect devices and receive file transfers."
msgstr "Включите для подключения устройств и передачи файлов."
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
msgid "Airplane Mode is on"
msgstr "Режим для авиаперелётов включён"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
msgid "Bluetooth is disabled when airplane mode is on."
msgstr "Адаптер Bluetooth отключается при включённом режиме для авиаперелётов"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
msgid "Hardware Airplane Mode is on"
msgstr "Аппаратный режим для _авиаперелётов включён"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
msgid "Turn off the Airplane mode switch to enable Bluetooth."
msgstr "Для включения Bluetooth выключите режим для авиаперелётов."
@@ -711,7 +712,7 @@ msgid "_Import File…"
msgstr "_Импортировать файл…"
#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../panels/network/connection-editor/net-connection-editor.c:519
#: ../panels/printers/new-printer-dialog.ui.h:4
#: ../panels/region/input-chooser.ui.h:3
#: ../panels/user-accounts/data/account-dialog.ui.h:3
@@ -887,7 +888,7 @@ msgid "Other…"
msgstr "Другой…"
#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
#: ../panels/region/cc-input-chooser.c:169
msgid "More…"
msgstr "Ещё…"
@@ -897,12 +898,12 @@ msgid "No languages found"
msgstr "Ни один язык не найден"
#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../panels/network/connection-editor/ce-page-details.c:106
msgid "Today"
msgstr "Сегодня"
#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
msgid "Yesterday"
msgstr "Вчера"
@@ -937,18 +938,18 @@ msgstr "Год"
# fix даты
#. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:339
msgid "%e %B %Y, %l:%M %p"
msgstr "%e %b. %Y, %l:%M %p"
# fix даты
#. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: ../panels/datetime/cc-datetime-panel.c:344
msgid "%e %B %Y, %R"
msgstr "%e %b. %Y, %R"
#. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:522
#, c-format
msgctxt "timezone loc"
msgid "%s, %s"
@@ -956,7 +957,7 @@ msgstr "%s, %s"
#. Update the timezone on the listbow row
#. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:552
#, c-format
msgctxt "timezone desc"
msgid "%s (%s)"
@@ -964,23 +965,23 @@ msgstr "%s (%s)"
#. Translators: UTC here means the Coordinated Universal Time.
#. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: ../panels/datetime/cc-datetime-panel.c:560
msgid "UTC%:::z"
msgstr "UTC%:::z"
#. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:565
msgid "%l:%M %p"
msgstr "%l:%M %p"
#. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: ../panels/datetime/cc-datetime-panel.c:570
msgid "%R"
msgstr "%R"
#. Update the text bubble in the timezone map
#. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:575
#, c-format
msgctxt "timezone map"
msgid "%s (%s)"
@@ -1110,165 +1111,157 @@ msgstr "Изменить системное время и дату"
msgid "To change time or date settings, you need to authenticate."
msgstr "Для изменения времени или даты требуется аутентификация."
-#: ../panels/display/cc-display-panel.c:592
-msgid "Lid Closed"
-msgstr "Крышка ноутбука закрыта"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:595
-msgid "Mirrored"
-msgstr "Дублируемый"
-
-#: ../panels/display/cc-display-panel.c:597
-#: ../panels/display/cc-display-panel.c:2449
-msgid "Primary"
-msgstr "Основной"
-
-#: ../panels/display/cc-display-panel.c:599
-#: ../panels/display/cc-display-panel.c:2786
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../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: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:602
-msgid "Secondary"
-msgstr "Дополнительный"
-
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1577
-msgid "Arrange Combined Displays"
-msgstr "Упорядочить сгруппированные экраны"
-
-#: ../panels/display/cc-display-panel.c:1581
-#: ../panels/display/cc-display-panel.c:2227
-#: ../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:1605
-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:1812
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Гц (NTSC)"
-
-#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1818
-#, c-format
-msgid "%d Hz"
-msgstr "%d Гц"
-
-#: ../panels/display/cc-display-panel.c:2279
-msgid "Rotate counterclockwise by 90°"
-msgstr "Повернуть против часовой стрелки на 90°"
+#: ../panels/display/cc-display-panel.c:742
+#, fuzzy
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Ландшафтная"
-#: ../panels/display/cc-display-panel.c:2297
-msgid "Rotate by 180°"
-msgstr "Повернуть на 180°"
+#: ../panels/display/cc-display-panel.c:745
+#, fuzzy
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Портретная"
-#: ../panels/display/cc-display-panel.c:2315
-msgid "Rotate clockwise by 90°"
-msgstr "Повернуть по часовой стрелке на 90°"
+#: ../panels/display/cc-display-panel.c:748
+#, fuzzy
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Портретная"
-#: ../panels/display/cc-display-panel.c:2336
-msgid "Size"
-msgstr "Размер"
+#: ../panels/display/cc-display-panel.c:751
+#, fuzzy
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Ландшафтная"
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2351
-msgid "Aspect Ratio"
-msgstr "Соотношение сторон"
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:792
+#: ../panels/display/cc-display-panel.c:842
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "Ориентация"
-#: ../panels/display/cc-display-panel.c:2374
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/display/cc-display-panel.c:885
+#: ../panels/display/cc-display-panel.c:937
+#: ../panels/display/cc-display-panel.c:1773
+#: ../panels/display/cc-display-panel.c:1819
+#: ../panels/printers/pp-options-dialog.c:87
msgid "Resolution"
msgstr "Разрешение"
-#: ../panels/display/cc-display-panel.c:2394
-msgid "Adjust for TV"
-msgstr "Отрегулировать для ТВ"
-
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:982
+#: ../panels/display/cc-display-panel.c:1053
msgid "Refresh Rate"
msgstr "Частота обновления"
-#: ../panels/display/cc-display-panel.c:2450
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "Показывать верхнюю панель и режим обзора на этом дисплее"
+#: ../panels/display/cc-display-panel.c:1208
+#, fuzzy
+#| msgctxt "background, style"
+#| msgid "Scale"
+msgid "Scale"
+msgstr "Масштаб"
-#: ../panels/display/cc-display-panel.c:2456
-msgid "Secondary Display"
+#: ../panels/display/cc-display-panel.c:1261
+msgid "Adjust for TV"
+msgstr "Отрегулировать для ТВ"
+
+#: ../panels/display/cc-display-panel.c:1473
+#: ../panels/display/cc-display-panel.c:1519
+#, fuzzy
+#| msgid "Secondary Display"
+msgid "Primary Display"
msgstr "Дополнительный экран"
-#: ../panels/display/cc-display-panel.c:2457
-msgid "Join this display with another to create an extra workspace"
-msgstr "Объединить этот дисплей с другим для увеличения рабочего пространства"
+#: ../panels/display/cc-display-panel.c:1568
+#, fuzzy
+#| msgid "Display Mapping"
+msgid "Display Arrangement"
+msgstr "Отображение на экран"
+
+#: ../panels/display/cc-display-panel.c:1569
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr ""
-#: ../panels/display/cc-display-panel.c:2464
-msgid "Presentation"
-msgstr "Презентация"
+#: ../panels/display/cc-display-panel.c:2007
+#, fuzzy
+#| msgid "Display Type"
+msgid "Display Mode"
+msgstr "Тип монитора"
-#: ../panels/display/cc-display-panel.c:2465
-msgid "Show slideshows and media only"
-msgstr "Показывать только слайд-шоу и мультимедиа"
+#: ../panels/display/cc-display-panel.c:2020
+#, fuzzy
+#| msgid "Displays"
+msgid "Join Displays"
+msgstr "Мониторы"
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2470
+#: ../panels/display/cc-display-panel.c:2023
msgid "Mirror"
msgstr "Зеркало"
-#: ../panels/display/cc-display-panel.c:2471
-msgid "Show your existing view on both displays"
-msgstr "Показывать текущий вид на обоих дисплеях"
+#: ../panels/display/cc-display-panel.c:2026
+#, fuzzy
+#| msgid "Secondary Display"
+msgid "Single Display"
+msgstr "Дополнительный экран"
+
+#: ../panels/display/cc-display-panel.c:2710
+msgid "Apply Changes?"
+msgstr ""
-#: ../panels/display/cc-display-panel.c:2477
-msgid "Turn Off"
-msgstr "Выключить"
+#: ../panels/display/cc-display-panel.c:2724
+#: ../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:2478
-msgid "Don’t use this display"
-msgstr "Не использовать этот монитор"
+#: ../panels/display/cc-display-panel.c:3090
+#, c-format
+msgid "%.1lf Hz"
+msgstr ""
#. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:2786
+#: ../panels/display/cc-display-panel.c:3306
#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
#: ../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: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/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
msgid "On"
msgstr "Включено"
-#: ../panels/display/cc-display-panel.c:2826
-msgid "Could not get screen information"
-msgstr "Не удалось получить информацию об экране"
-
-#: ../panels/display/cc-display-panel.c:2857
-msgid "_Arrange Combined Displays"
-msgstr "_Расположить объединённые дисплеи"
+#: ../panels/display/cc-display-panel.c:3306 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "Выключено"
-#: ../panels/display/cc-display-panel.c:2878
+#: ../panels/display/cc-display-panel.c:3327
msgid "_Night Light"
msgstr "_Ночная подсветка"
+#: ../panels/display/cc-display-panel.c:3392
+msgid "Could not get screen information"
+msgstr "Не удалось получить информацию об экране"
+
#. This cancels the redshift inhibit.
#: ../panels/display/display.ui.h:2
msgid "Restart Filter"
@@ -1301,8 +1294,9 @@ msgid "Sunset to Sunrise"
msgstr "От заката до восхода солнца"
#: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
#: ../panels/network/network-wifi.ui.h:26
#: ../panels/privacy/cc-privacy-panel.c:217
msgid "Manual"
@@ -1349,70 +1343,87 @@ msgstr ""
"Синий;смещение;цвет;закат;рассвет;"
#. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:384 ../panels/network/panel-common.c:123
+#: ../panels/info/cc-info-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
msgid "Unknown"
msgstr "Неизвестно"
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture and the build id, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or
-#. * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)"
-#: ../panels/info/cc-info-panel.c:517
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
#, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d-бит (ID сборки: %s)"
+msgid "%s; Build ID: %s"
+msgstr "%s; ID сборки: %s"
-#: ../panels/info/cc-info-panel.c:519
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
#, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d-бит (ID сборки: %s)"
+msgid "64-bit"
+msgstr "64-бит"
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit"
-#: ../panels/info/cc-info-panel.c:527
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
#, c-format
-msgid "%s %d-bit"
-msgstr "%s %d-бит"
+msgid "32-bit"
+msgstr "32-бит"
-#: ../panels/info/cc-info-panel.c:529
+#: ../panels/info/cc-info-overview-panel.c:800
#, c-format
-msgid "%d-bit"
-msgstr "%d-бит"
+msgid "Version %s"
+msgstr "Версия %s"
+
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "Раздел"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "Обзор"
+
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "Приложения по умолчанию"
+
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "Съёмный носитель"
-#: ../panels/info/cc-info-panel.c:1175
+#: ../panels/info/cc-info-removable-media-panel.c:312
msgid "Ask what to do"
msgstr "Спрашивать, что делать"
-#: ../panels/info/cc-info-panel.c:1179
+#: ../panels/info/cc-info-removable-media-panel.c:316
msgid "Do nothing"
msgstr "Ничего не делать"
-#: ../panels/info/cc-info-panel.c:1183
+#: ../panels/info/cc-info-removable-media-panel.c:320
msgid "Open folder"
msgstr "Открыть папку"
-#: ../panels/info/cc-info-panel.c:1274
+#: ../panels/info/cc-info-removable-media-panel.c:411
msgid "Other Media"
msgstr "Другой носитель"
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:444
msgid "Select an application for audio CDs"
msgstr "Выберите приложение для звуковых компакт-дисков"
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:445
msgid "Select an application for video DVDs"
msgstr "Выберите приложения для видео DVD"
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:446
msgid "Select an application to run when a music player is connected"
msgstr "Выберите приложение, запускаемое при подключении музыкального плеера"
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:447
msgid "Select an application to run when a camera is connected"
msgstr "Выберите приложение, запускаемое при подключении камеры"
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-removable-media-panel.c:448
msgid "Select an application for software CDs"
msgstr "Выберите приложение для компакт-дисков с программами"
@@ -1421,85 +1432,84 @@ msgstr "Выберите приложение для компакт-дисков
#. * If the shared-mime-info translation works for your language,
#. * simply leave these untranslated.
#.
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-removable-media-panel.c:460
msgid "audio DVD"
msgstr "звуковой DVD"
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-removable-media-panel.c:461
msgid "blank Blu-ray disc"
msgstr "чистый диск Blu-ray"
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-removable-media-panel.c:462
msgid "blank CD disc"
msgstr "чистый компакт-диск"
-#: ../panels/info/cc-info-panel.c:1324
+#: ../panels/info/cc-info-removable-media-panel.c:463
msgid "blank DVD disc"
msgstr "чистый диск DVD"
-#: ../panels/info/cc-info-panel.c:1325
+#: ../panels/info/cc-info-removable-media-panel.c:464
msgid "blank HD DVD disc"
msgstr "чистый диск HD DVD"
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-removable-media-panel.c:465
msgid "Blu-ray video disc"
msgstr "видеодиск Blu-ray"
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-removable-media-panel.c:466
msgid "e-book reader"
msgstr "устройство чтения электронных книг"
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-removable-media-panel.c:467
msgid "HD DVD video disc"
msgstr "видеодиск HD DVD"
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-removable-media-panel.c:468
msgid "Picture CD"
msgstr "диск Picture CD"
-#: ../panels/info/cc-info-panel.c:1330
+#: ../panels/info/cc-info-removable-media-panel.c:469
msgid "Super Video CD"
msgstr "компакт-диск Super Video"
-#: ../panels/info/cc-info-panel.c:1331
+#: ../panels/info/cc-info-removable-media-panel.c:470
msgid "Video CD"
msgstr "видеодиск VCD"
-#: ../panels/info/cc-info-panel.c:1332
+#: ../panels/info/cc-info-removable-media-panel.c:471
msgid "Windows software"
msgstr "приложение Windows"
-#: ../panels/info/cc-info-panel.c:1455
-msgid "Section"
-msgstr "Раздел"
-
-#: ../panels/info/cc-info-panel.c:1464 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "Обзор"
-
-#: ../panels/info/cc-info-panel.c:1470 ../panels/info/info.ui.h:21
-msgid "Default Applications"
+#. 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-default-apps-panel.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Default Applications"
+msgid "Default Applications"
msgstr "Приложения по умолчанию"
-#: ../panels/info/cc-info-panel.c:1475 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "Съёмный носитель"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#, fuzzy
+#| msgid "Default Applications"
+msgid "Configure Default Applications"
+msgstr "Приложения по умолчанию"
-#: ../panels/info/cc-info-panel.c:1500
-#, c-format
-msgid "Version %s"
-msgstr "Версия %s"
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+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/info/gnome-info-panel.desktop.in.in.h:2
-msgid "Details"
-msgstr "Подробности"
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "About"
+msgstr ""
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
#: ../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-overview-panel.desktop.in.in.h:5
#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
msgid ""
"device;system;information;memory;processor;version;default;application;"
@@ -1509,108 +1519,146 @@ msgstr ""
"альтернативный;предпочтительный;cd;dvd;usb;аудио;видео;диск;съёмный;съемный;"
"носитель;автозапуск;"
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "Выберите способ обработки другого носителя"
-
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "_Действие:"
-
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "_Тип:"
-
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "Название устройства"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "Память"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-msgstr "Процессор"
-
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "Базовая система"
-
-#: ../panels/info/info.ui.h:9
-msgid "Disk"
-msgstr "Диск"
-
-#: ../panels/info/info.ui.h:10
-msgid "Calculating…"
-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/info/gnome-info-panel.desktop.in.in.h:2
+msgid "Details"
+msgstr "Подробности"
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-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/info/gnome-removable-media-panel.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Removable Media"
+msgid "Removable Media"
+msgstr "Съёмный носитель"
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "Виртуализация"
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#, fuzzy
+#| msgid "Removable Media"
+msgid "Configure Removable Media settings"
+msgstr "Съёмный носитель"
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "Проверить наличие обновлений"
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#, fuzzy
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"устройство;система;информация;память;процессор;версия;умолчанию;приложение;"
+"альтернативный;предпочтительный;cd;dvd;usb;аудио;видео;диск;съёмный;съемный;"
+"носитель;автозапуск;"
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info-default-apps.ui.h:1
msgid "_Web"
msgstr "_Интернет"
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info-default-apps.ui.h:2
msgid "_Mail"
msgstr "_Почта"
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info-default-apps.ui.h:3
msgid "_Calendar"
msgstr "_Календарь"
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info-default-apps.ui.h:4
msgid "M_usic"
msgstr "_Музыка"
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info-default-apps.ui.h:5
msgid "_Video"
msgstr "_Видео"
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info-default-apps.ui.h:6
+#: ../panels/info/info-removable-media.ui.h:5
msgid "_Photos"
msgstr "_Фото"
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-overview.ui.h:1
+msgid "Device name"
+msgstr "Название устройства"
+
+#: ../panels/info/info-overview.ui.h:2
+msgid "Memory"
+msgstr "Память"
+
+#: ../panels/info/info-overview.ui.h:3
+msgid "Processor"
+msgstr "Процессор"
+
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "Графика"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr "Название ОС"
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+msgid "OS type"
+msgstr "Тип ОС"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "Виртуализация"
+
+#: ../panels/info/info-overview.ui.h:10
+msgid "Disk"
+msgstr "Диск"
+
+#: ../panels/info/info-overview.ui.h:11
+msgid "Calculating…"
+msgstr "Вычисление…"
+
+#: ../panels/info/info-overview.ui.h:12
+msgid "Check for updates"
+msgstr "Проверить наличие обновлений"
+
+#: ../panels/info/info-removable-media.ui.h:1
msgid "Select how media should be handled"
msgstr "Выберите способ обработки носителя"
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
msgid "CD _audio"
msgstr "_Звуковой компакт-диск"
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
msgid "_DVD video"
msgstr "_Видео-DVD"
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
msgid "_Music player"
msgstr "_Музыкальный плеер"
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
msgid "_Software"
msgstr "_Приложение"
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
msgid "_Other Media…"
msgstr "Д_ругой носитель…"
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
msgid "_Never prompt or start programs on media insertion"
msgstr ""
"_Никогда не спрашивать и не запускать программы при подключении носителя"
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "Выберите способ обработки другого носителя"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "_Действие:"
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "_Тип:"
+
#: ../panels/keyboard/00-multimedia.xml.in.h:1
msgid "Sound and Media"
msgstr "Звук и носители"
@@ -1656,7 +1704,7 @@ msgid "Eject"
msgstr "Извлечь"
#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:12
msgid "Typing"
msgstr "Ввод"
@@ -1676,8 +1724,8 @@ msgstr "Запуск приложений"
msgid "Launch help browser"
msgstr "Запустить справочный браузер"
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:277
-#: ../shell/alt/cc-window.c:830 ../shell/cc-window.c:1590
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
msgid "Settings"
msgstr "Параметры"
@@ -1786,9 +1834,9 @@ msgstr "Уменьшить размер текста"
msgid "High contrast on or off"
msgstr "Включить или выключить высокую контрастность"
-#: ../panels/keyboard/cc-keyboard-manager.c:512
-#: ../panels/keyboard/cc-keyboard-manager.c:520
-#: ../panels/keyboard/cc-keyboard-manager.c:828
+#: ../panels/keyboard/cc-keyboard-manager.c:506
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:822
msgid "Custom Shortcuts"
msgstr "Дополнительные комбинации клавиш"
@@ -1799,10 +1847,11 @@ msgstr "Дополнительные комбинации клавиш"
#. * The device has been disabled
#: ../panels/keyboard/cc-keyboard-option.c:276
#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/keyboard-shortcuts.c:435
#: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/sound/gvc/gvc-mixer-control.c:1866
#: ../panels/user-accounts/um-fingerprint-dialog.c:214
msgid "Disabled"
msgstr "Выключено"
@@ -1840,7 +1889,7 @@ msgstr ""
"клавиш. Это действие нельзя отменить."
#: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/shortcut-editor.ui.h:9
#: ../panels/printers/authentication-dialog.ui.h:2
#: ../panels/printers/ppd-selection-dialog.ui.h:2
msgid "Cancel"
@@ -1854,7 +1903,7 @@ msgstr "Сбросить все"
msgid "Reset the shortcut to its default value"
msgstr "Сбросить комбинацию на значение по умолчанию"
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:433
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
#, c-format
msgid ""
"%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1863,21 +1912,21 @@ msgstr ""
"%s уже используется для <b>%s</b>. Если применить, комбинация для %s будет "
"отключена"
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
msgid "Set Custom Shortcut"
msgstr "Установить пользовательскую комбинацию клавиш"
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
msgid "Set Shortcut"
msgstr "Установить комбинацию клавиш"
#. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:608
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
#, c-format
msgid "Enter new shortcut to change <b>%s</b>."
msgstr "Введите новую комбинацию для изменения <b>%s</b>."
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1036
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
msgid "Add Custom Shortcut"
msgstr "Добавить пользовательскую комбинацию клавиш"
@@ -1893,8 +1942,9 @@ msgstr "Просмотр и изменение комбинаций клавиш
#. Translators: those are keywords for the keyboard control-center panel
#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Комбинация;Повтор;Мигание;"
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
@@ -1918,8 +1968,8 @@ msgid "Try a different search"
msgstr "Попробуйте другой поисковый запрос"
#: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "Нажмите клавишу Esc для отмены."
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr "Нажмите Esc для отмены или Backspace для сброса комбинации клавиш."
#: ../panels/keyboard/shortcut-editor.ui.h:3
#: ../panels/printers/details-dialog.ui.h:1
@@ -1946,16 +1996,14 @@ msgid "None"
msgstr "Нет"
#: ../panels/keyboard/shortcut-editor.ui.h:8
-msgid "Remove"
-msgstr "Удалить"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:9
msgid "Enter the new shortcut"
msgstr "Введите новую комбинацию"
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Remove"
+msgstr "Удалить"
+
#: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
msgid "Add"
msgstr "Добавить"
@@ -2083,13 +2131,8 @@ msgstr "Двойной щелчок, вторичная кнопка"
msgid "Single click, secondary button"
msgstr "Один щелчок, вторичная кнопка"
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:349
-msgid "Air_plane Mode"
-msgstr "Режим для _авиаперелётов"
-
-#: ../panels/network/cc-network-panel.c:953
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:581
msgid "Network proxy"
msgstr "Прокси"
@@ -2097,53 +2140,60 @@ msgstr "Прокси"
#. * window for vpn connections, it is also used to display
#. * vpn connections in the device list.
#.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: ../panels/network/cc-network-panel.c:717 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
#, c-format
msgid "%s VPN"
msgstr "VPN %s"
-#: ../panels/network/cc-network-panel.c:1194
+#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr ""
"К сожалению, что-то пошло не так. Обратитесь к поставщику программного "
"обеспечения."
-#: ../panels/network/cc-network-panel.c:1200
+#: ../panels/network/cc-network-panel.c:787
msgid "NetworkManager needs to be running."
msgstr "NetworkManager должен быть запущен."
+#. 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/cc-wifi-panel.c:209
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
msgid "802.1x _Security"
msgstr "_Безопасность 802.1x"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/connection-editor/security-page.ui.h:2
#: ../panels/wacom/wacom-stylus-page.ui.h:8
msgid "page 1"
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:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
msgid "Anony_mous identity"
msgstr "А_нонимная аутентификация"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:4
msgid "Inner _authentication"
msgstr "Внутренняя _аутентификация"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
+#: ../panels/network/connection-editor/security-page.ui.h:5
#: ../panels/wacom/wacom-stylus-page.ui.h:16
msgid "page 2"
msgstr "страница 2"
#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
+#: ../panels/network/connection-editor/ce-page-security.c:445
#: ../panels/network/connection-editor/details-page.ui.h:3
#: ../panels/network/network-wifi.ui.h:6
msgid "Security"
@@ -2159,47 +2209,47 @@ msgid "Profile %d"
msgstr "Профиль %d"
#. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:215
-#: ../panels/network/net-device-wifi.c:391
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
msgid "WEP"
msgstr "WEP"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:396
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
#: ../panels/network/network-wifi.ui.h:19
msgid "WPA"
msgstr "WPA"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:223
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
msgid "WPA2"
msgstr "WPA2"
#. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
msgid "Enterprise"
msgstr "Предприятие"
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:233
-#: ../panels/network/net-device-wifi.c:381
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
msgctxt "Wifi security"
msgid "None"
msgstr "Нет"
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
#: ../panels/power/power.ui.h:17
msgid "Never"
msgstr "Никогда"
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:486
+#: ../panels/network/net-device-wifi.c:505
#, c-format
msgid "%i day ago"
msgid_plural "%i days ago"
@@ -2208,173 +2258,121 @@ msgstr[1] "%i дня назад"
msgstr[2] "%i дней назад"
#. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:544
+#: ../panels/network/net-device-wifi.c:561
#, c-format
msgid "%d Mb/s"
msgstr "%d Мб/с"
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:590
msgctxt "Signal strength"
msgid "None"
msgstr "Нет"
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:592
msgctxt "Signal strength"
msgid "Weak"
msgstr "Слабый"
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:594
msgctxt "Signal strength"
msgid "Ok"
msgstr "Средний"
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:596
msgctxt "Signal strength"
msgid "Good"
msgstr "Хороший"
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:581
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:598
msgctxt "Signal strength"
msgid "Excellent"
msgstr "Отличный"
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:269
+#: ../panels/network/connection-editor/ce-page-details.c:248
+#, fuzzy
+#| msgid "Export VPN connection"
+msgid "Forget Connection"
+msgstr "Экспортировать VPN-соединение"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+#, fuzzy
+#| msgid "Connection failed"
+msgid "Remove Connection Profile"
+msgstr "Сбой подключения"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+#, fuzzy
+#| msgid "Remove"
+msgid "Remove VPN"
+msgstr "Удалить"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
#: ../shell/panel-list.ui.h:2
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/connection-editor/ce-page-ethernet.c:173
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
#: ../panels/network/network-wifi.ui.h:47
msgid "Identity"
msgstr "Идентификация"
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-#: ../panels/printers/details-dialog.ui.h:3
-msgid "Address"
-msgstr "Адрес"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "Маска сети"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../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:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
msgid "Delete Address"
msgstr "Удалить адрес"
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "Сервер"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../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:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "Метрика"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
msgid "Delete Route"
msgstr "Удалить маршрут"
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "Автоматический (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "Только для локальной сети"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:980
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
#: ../panels/network/network-wifi.ui.h:48
msgid "IPv4"
msgstr "IPv4"
-#: ../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: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:217
-msgid "Automatic"
-msgstr "Автоматический"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "Автоматический, только DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:827
#: ../panels/network/network-wifi.ui.h:49
msgid "IPv6"
msgstr "IPv6"
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-msgid "Reset"
-msgstr "Сбросить"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: ../panels/network/connection-editor/ce-page-security.c:245
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "Нет"
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: ../panels/network/connection-editor/ce-page-security.c:268
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "40/128-битный ключ WEP (Hex или ASCII)"
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: ../panels/network/connection-editor/ce-page-security.c:278
msgid "WEP 128-bit Passphrase"
msgstr "128-битная парольная фраза WEP"
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: ../panels/network/connection-editor/ce-page-security.c:291
+#: ../panels/network/wireless-security/wireless-security.c:465
msgid "LEAP"
msgstr "LEAP"
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: ../panels/network/connection-editor/ce-page-security.c:304
msgid "Dynamic WEP (802.1x)"
msgstr "Динамический WEP (802.1x)"
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: ../panels/network/connection-editor/ce-page-security.c:318
msgid "WPA & WPA2 Personal"
msgstr "Персональный WPA и WPA2"
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: ../panels/network/connection-editor/ce-page-security.c:332
msgid "WPA & WPA2 Enterprise"
msgstr "Корпоративный WPA и WPA2"
@@ -2390,7 +2388,6 @@ msgstr "Скорость передачи данных"
#: ../panels/network/connection-editor/details-page.ui.h:4
#: ../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:644
msgid "IPv4 Address"
msgstr "Адрес IPv4"
@@ -2399,14 +2396,12 @@ msgstr "Адрес IPv4"
#: ../panels/network/net-device-ethernet.c:154
#: ../panels/network/net-device-ethernet.c:158
#: ../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:645
msgid "IPv6 Address"
msgstr "Адрес IPv6"
#: ../panels/network/connection-editor/details-page.ui.h:6
#: ../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 "Аппаратный адрес"
@@ -2414,17 +2409,15 @@ msgstr "Аппаратный адрес"
#: ../panels/network/connection-editor/details-page.ui.h:7
#: ../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
msgid "Default Route"
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/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
#: ../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
msgid "DNS"
msgstr "DNS"
@@ -2433,6 +2426,23 @@ msgstr "DNS"
msgid "Last Used"
msgstr "Последнее использование"
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "Подключаться _автоматически"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "Сделать доступным для _других пользователей"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "Автоматический"
+
#: ../panels/network/connection-editor/ethernet-page.ui.h:2
msgid "Twisted Pair (TP)"
msgstr "Витая пара"
@@ -2489,117 +2499,122 @@ msgstr "_Клонированный адрес"
msgid "bytes"
msgstr "байт"
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "Сделать доступным для других _пользователей"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#, fuzzy
+#| msgid "_Method"
+msgid "IPv_4 Method"
+msgstr "_Метод"
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "Подключаться _автоматически"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "Автоматический (DHCP)"
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "_Зона брандмауэра"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "Только для локальной сети"
-#: ../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/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#, fuzzy
+#| msgid "Disabled"
+msgid "Disable"
+msgstr "Выключено"
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "Зона определяет уровень доверия соединению"
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#, fuzzy
+#| msgid "_Addresses"
+msgid "Addresses"
+msgstr "_Адреса"
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "Адрес"
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "_Адреса"
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "Маска сети"
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
msgid "Automatic DNS"
msgstr "Автоматический DNS"
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
#: ../panels/network/network-wifi.ui.h:32
msgid "Routes"
msgstr "Маршруты"
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
msgid "Automatic Routes"
msgstr "Автоматические маршруты"
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#, fuzzy
+#| msgctxt "network parameters"
+#| msgid "Metric"
+msgid "Metric"
+msgstr "Метрика"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
#: ../panels/network/network-wifi.ui.h:34
msgid "Use this connection _only for resources on its network"
msgstr "Использовать это подключение _только для ресурсов в этой сети"
#: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+#, fuzzy
+#| msgid "_Method"
+msgid "IPv_6 Method"
+msgstr "_Метод"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "Автоматический, только DHCP"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "Префикс"
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/net-connection-editor.c:273
msgid "Unable to open connection editor"
msgstr "Не удалось открыть редактор соединений"
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
msgid "New Profile"
msgstr "Создать профиль"
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
msgid "VPN"
msgstr "VPN"
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
msgid "Import from file…"
msgstr "Импортировать из файла…"
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
msgid "Add VPN"
msgstr "Добавить VPN"
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "_Сбросить"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1586
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "_Забыть"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr ""
-"Сбросить параметры этой сети, включая пароли, и запомнить её в качестве "
-"предпочтительной сети"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr ""
-"Удалить все параметры, относящиеся к этой сети, и не пытаться автоматически "
-"подключаться к этой сети"
-
#: ../panels/network/connection-editor/security-page.ui.h:1
#: ../panels/network/network-wifi.ui.h:16
msgid "S_ecurity"
@@ -2629,7 +2644,7 @@ msgstr "Выберите файл для импортирования"
#: ../panels/network/connection-editor/vpn-helpers.c:182
#: ../panels/printers/pp-details-dialog.c:320
#: ../panels/sharing/cc-sharing-panel.c:376
-#: ../panels/user-accounts/um-photo-dialog.c:219
+#: ../panels/user-accounts/um-photo-dialog.c:222
msgid "_Open"
msgstr "_Открыть"
@@ -2666,7 +2681,7 @@ msgstr ""
msgid "Export VPN connection"
msgstr "Экспортировать VPN-соединение"
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
msgid "(Error: unable to load VPN connection editor)"
msgstr "(Ошибка: не удалось загрузить редактор VPN-соединений)"
@@ -2685,10 +2700,6 @@ msgstr "_BSSID"
msgid "My Home Network"
msgstr "Моя домашняя сеть"
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-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/network/gnome-network-panel.desktop.in.in.h:2
msgid "Network"
@@ -2707,18 +2718,35 @@ msgstr ""
"Сеть;Беспроводная;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Мобильная;Модем;Bluetooth;vpn;"
"DNS;"
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#, fuzzy
+#| msgid "Control how you connect to the Internet"
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "Управление подключением к Интернету"
+
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#, fuzzy
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;DNS;"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr ""
+"Сеть;Беспроводная;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Мобильная;Модем;Bluetooth;vpn;"
+"DNS;"
+
#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-wifi.c:491
msgid "never"
msgstr "никогда"
#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:482
+#: ../panels/network/net-device-wifi.c:501
msgid "today"
msgstr "сегодня"
#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:484
+#: ../panels/network/net-device-wifi.c:503
msgid "yesterday"
msgstr "вчера"
@@ -2738,41 +2766,32 @@ msgstr "Последнее использование"
#. * profile. It is also used to display ethernet in the
#. * device list.
#.
-#: ../panels/network/net-device-ethernet.c:280
+#: ../panels/network/net-device-ethernet.c:275
#: ../panels/network/network-ethernet.ui.h:1
#: ../panels/network/network-simple.ui.h:1
msgid "Wired"
msgstr "Проводные"
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1744
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1792
+#: ../panels/network/network-ethernet.ui.h:2
#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
msgid "Options…"
msgstr "Параметры…"
-#: ../panels/network/net-device-mobile.c:223
+#: ../panels/network/net-device-mobile.c:238
msgid "Add new connection"
msgstr "Добавить новое подключение"
-#: ../panels/network/net-device-wifi.c:1254
-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."
-msgstr ""
-"Если помимо беспроводного доступа в Интернет имеется ещё какое-либо "
-"подключение к Интернету, беспроводную точку доступа можно настроить для "
-"подключения к Интернету других пользователей."
-
-#: ../panels/network/net-device-wifi.c:1258
+#: ../panels/network/net-device-wifi.c:1275
#, 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:1262
+#: ../panels/network/net-device-wifi.c:1279
msgid ""
"It is not possible to access the Internet through your wireless while the "
"hotspot is active."
@@ -2780,23 +2799,39 @@ msgstr ""
"Доступ к Интернету по беспроводному каналу возможен только при отключённой "
"точке доступа."
-#: ../panels/network/net-device-wifi.c:1344
+#: ../panels/network/net-device-wifi.c:1286
+#, fuzzy
+#| msgid "Wi-Fi Hotspot"
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Точка доступа Wi-Fi"
+
+#: ../panels/network/net-device-wifi.c:1308
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr ""
+
+#: ../panels/network/net-device-wifi.c:1319
+msgid "_Turn On"
+msgstr "_Включить"
+
+#: ../panels/network/net-device-wifi.c:1396
msgid "Stop hotspot and disconnect any users?"
msgstr "Остановить точку доступа и отключить всех пользователей?"
-#: ../panels/network/net-device-wifi.c:1347
+#: ../panels/network/net-device-wifi.c:1399
msgid "_Stop Hotspot"
msgstr "_Остановить точку доступа"
-#: ../panels/network/net-device-wifi.c:1447
+#: ../panels/network/net-device-wifi.c:1496
msgid "System policy prohibits use as a Hotspot"
msgstr "Использование в качестве точки доступа запрещено системной политикой"
-#: ../panels/network/net-device-wifi.c:1450
+#: ../panels/network/net-device-wifi.c:1499
msgid "Wireless device does not support Hotspot mode"
msgstr "Беспроводное устройство не поддерживает режим точки доступа"
-#: ../panels/network/net-device-wifi.c:1582
+#: ../panels/network/net-device-wifi.c:1630
msgid ""
"Network details for the selected networks, including passwords and any "
"custom configuration will be lost."
@@ -2804,25 +2839,24 @@ msgstr ""
"Сетевые данные для выделенных сетей, включая пароли и любые пользовательские "
"настройки, будут утеряны."
-#: ../panels/network/net-device-wifi.c:1892
-msgid "History"
-msgstr "История"
+#: ../panels/network/net-device-wifi.c:1634
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "_Забыть"
-#: ../panels/network/net-device-wifi.c:1896
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:505
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "_Закрыть"
+#: ../panels/network/net-device-wifi.c:1943
+#: ../panels/network/net-device-wifi.c:1950
+msgid "Known Wi-Fi Networks"
+msgstr ""
#. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1904
+#: ../panels/network/net-device-wifi.c:1983
msgctxt "Wi-Fi Network"
msgid "_Forget"
msgstr "_Забыть"
#. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: ../panels/network/net-proxy.c:102
msgid ""
"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
msgstr ""
@@ -2833,18 +2867,10 @@ msgstr ""
#. * network, then anyone else on that network can tell your
#. * machine that it should proxy all of your web traffic
#. * through them.
-#: ../panels/network/net-proxy.c:75
+#: ../panels/network/net-proxy.c:110
msgid "This is not recommended for untrusted public networks."
msgstr "Не рекомендуется использовать для непроверенных общедоступных сетей."
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "Прокси"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "_Добавить профиль…"
-
#: ../panels/network/network-mobile.ui.h:1
msgid "IMEI"
msgstr "IMEI"
@@ -2858,95 +2884,66 @@ msgid "Network"
msgstr "Сеть"
#: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "Отсутствует"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Ручной"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Автоматический"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Метод"
+#, fuzzy
+#| msgid "Network proxy"
+msgid "Network Proxy"
+msgstr "Прокси"
#: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "URL _автоматической настройки"
-
-#: ../panels/network/network-proxy.ui.h:6
msgid "_HTTP Proxy"
msgstr "Прокси для H_TTP"
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
msgid "H_TTPS Proxy"
msgstr "Прокси для H_TTPS"
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
msgid "_FTP Proxy"
msgstr "Прокси для _FTP"
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
msgid "_Socks Host"
msgstr "Узел S_ocks"
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
msgid "_Ignore Hosts"
msgstr "_Игнорировать узлы"
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
msgid "HTTP proxy port"
msgstr "Порт прокси для HTTP"
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
msgid "HTTPS proxy port"
msgstr "Порт прокси для HTTPS"
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
msgid "FTP proxy port"
msgstr "Порт прокси для FTP"
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
msgid "Socks proxy port"
msgstr "Порт прокси для Socks"
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "URL _автоматической настройки"
+
+#: ../panels/network/network-simple.ui.h:2
msgid "Turn device off"
msgstr "Выключить устройство"
+#. Translators: The found device is a printer connected via Bluetooth
#: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "Добавить устройство"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "Удалить устройство"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr ""
#: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "Тип VPN"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "Имя группы"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "Пароль группы"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
-msgid "Username"
-msgstr "Имя пользователя"
-
-#: ../panels/network/network-vpn.ui.h:6
msgid "Turn VPN connection off"
msgstr "Выключить VPN-соединение"
@@ -2981,6 +2978,14 @@ msgstr "Доступно для других пользователей"
msgid "identity"
msgstr "идентичность"
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "_Адреса"
+
#: ../panels/network/network-wifi.ui.h:28
msgid "Automatic (DHCP) addresses only"
msgstr "Только автоматические адреса (DHCP)"
@@ -3001,6 +3006,10 @@ msgstr "_Игнорировать автоматически полученны
msgid "ipv4"
msgstr "ipv4"
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
#: ../panels/network/network-wifi.ui.h:37
msgid "ipv6"
msgstr "ipv6"
@@ -3013,6 +3022,10 @@ msgstr "_Клонированный MAC-адрес"
msgid "hardware"
msgstr "аппаратура"
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "_Сбросить"
+
#: ../panels/network/network-wifi.ui.h:43
msgid ""
"Reset the settings for this connection to their defaults, but remember as a "
@@ -3047,52 +3060,78 @@ msgid "Wi-Fi Hotspot"
msgstr "Точка доступа Wi-Fi"
#: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "_Включить"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "Выключить Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "_Сделать точкой доступа…"
-
-#: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "_Подключиться к скрытой сети…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "_История"
-
-#: ../panels/network/network-wifi.ui.h:59
msgid "Switch off to connect to a Wi-Fi network"
msgstr "Выключите, если хотите подключиться к беспроводной сети"
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:54
msgid "Network Name"
msgstr "Название сети"
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/network-wifi.ui.h:55
msgid "Connected Devices"
msgstr "Подключённые устройства"
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:56
msgid "Security type"
msgstr "Тип безопасности"
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:57
#: ../panels/printers/authentication-dialog.ui.h:5
#: ../panels/printers/new-printer-dialog.ui.h:14
#: ../panels/user-accounts/data/account-dialog.ui.h:9
msgid "Password"
msgstr "Пароль"
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Turn Wi-Fi off"
+msgstr "Выключить Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:60
+msgid "_Connect to Hidden Network…"
+msgstr "_Подключиться к скрытой сети…"
+
+#: ../panels/network/network-wifi.ui.h:61
+#, fuzzy
+#| msgid "Wi-Fi Hotspot"
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "Точка доступа Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "_Known Wi-Fi Networks"
+msgstr ""
+
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr ""
+
+#: ../panels/network/wifi.ui.h:2
+#, fuzzy
+#| msgid "No Printers Found"
+msgid "No Wi-Fi Adapter Found"
+msgstr "Принтеры не найдены"
+
+#: ../panels/network/wifi.ui.h:3
+#, fuzzy
+#| msgid "Air_plane Mode"
+msgid "Airplane Mode"
+msgstr "Режим для _авиаперелётов"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr ""
+
+#: ../panels/network/wifi.ui.h:5
+#, fuzzy
+#| msgid "Networks"
+msgid "Visible Networks"
+msgstr "Сети"
+
+#: ../panels/network/wifi.ui.h:6
+#, fuzzy
+#| msgid "NetworkManager needs to be running."
+msgid "NetworkManager needs to be running"
+msgstr "NetworkManager должен быть запущен."
+
#. TRANSLATORS: AP type
#: ../panels/network/panel-common.c:127
msgid "Ad-hoc"
@@ -3374,23 +3413,23 @@ msgstr "Отсутствует прошивка"
msgid "Cable unplugged"
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:57
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "неизвестная ошибка в безопасности 802.1X (wpa-eap)"
-#: ../panels/network/wireless-security/eap-method.c:245
+#: ../panels/network/wireless-security/eap-method.c:233
msgid "no file selected"
msgstr "файлы не выбраны"
-#: ../panels/network/wireless-security/eap-method.c:276
+#: ../panels/network/wireless-security/eap-method.c:264
msgid "unspecified error validating eap-method file"
msgstr "неизвестная ошибка проверки файла ЕАР-методом"
-#: ../panels/network/wireless-security/eap-method.c:480
+#: ../panels/network/wireless-security/eap-method.c:439
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:483
+#: ../panels/network/wireless-security/eap-method.c:442
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "Сертификаты DER или PEM (*.der, *.pem, *.crt, *.cer)"
@@ -3400,13 +3439,13 @@ 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
+#: ../panels/network/wireless-security/eap-method-ttls.c:351
msgid "GTC"
msgstr "GTC"
#: ../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
+#: ../panels/network/wireless-security/eap-method-ttls.c:289
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
@@ -3419,37 +3458,28 @@ msgid "PAC files (*.pac)"
msgstr "Файлы PAC (*.pac)"
#: ../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
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
msgid "Anonymous"
msgstr "Анонимный"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
msgid "Authenticated"
msgstr "Аутентифицированный"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
msgid "Both"
msgstr "Оба"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
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
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../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:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
msgid "Allow automatic PAC pro_visioning"
msgstr "Разрешить автоматическое _выделение ресурсов PAC"
@@ -3486,38 +3516,38 @@ 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
+#: ../panels/network/wireless-security/eap-method-ttls.c:336
+#: ../panels/network/wireless-security/wireless-security.c:441
msgid "MD5"
msgstr "MD5"
#: ../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
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
msgid "Choose a Certificate Authority certificate"
msgstr "Выберите сертификат центра сертификации"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
msgid "Version 0"
msgstr "Версия 0"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
msgid "Version 1"
msgstr "Версия 1"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
msgid "C_A certificate"
msgstr "Сертификат C_A"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
msgid "No CA certificate is _required"
msgstr "Сертификат CA не _требуется"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
msgid "PEAP _version"
msgstr "_Версия PEAP"
@@ -3562,13 +3592,13 @@ msgstr "Незашифрованные закрытые ключи являют
#: ../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 "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
"\n"
"(You can password-protect your private key with openssl)"
msgstr ""
-"Кажется, выбранный приватный ключ не защищён паролем. Это может привести к "
+"Возможно, выбранный приватный ключ не защищён паролем. Это может привести к "
"компрометированию ваших учётных данных. Выберите приватный ключ, защищённый "
"паролем.\n"
"\n"
@@ -3607,45 +3637,49 @@ msgstr "недействительный сертификат EAP-TTLS CA: %s"
msgid "invalid EAP-TTLS CA certificate: no certificate specified"
msgstr "недействительный сертификат EAP-TTLS CA: сертификат не указан"
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: ../panels/network/wireless-security/eap-method-ttls.c:259
msgid "PAP"
msgstr "PAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: ../panels/network/wireless-security/eap-method-ttls.c:274
msgid "MSCHAP"
msgstr "MSCHAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: ../panels/network/wireless-security/eap-method-ttls.c:305
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (без EAP)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:321
msgid "CHAP"
msgstr "CHAP"
#: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
-msgstr "Неизвестная ошибка проверки безопасности 802.1x"
+msgid "Unknown error validating 802.1X security"
+msgstr "Неизвестная ошибка проверки безопасности 802.1X"
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: ../panels/network/wireless-security/wireless-security.c:453
msgid "TLS"
msgstr "TLS"
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: ../panels/network/wireless-security/wireless-security.c:477
msgid "PWD"
msgstr "PWD"
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: ../panels/network/wireless-security/wireless-security.c:488
msgid "FAST"
msgstr "FAST"
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: ../panels/network/wireless-security/wireless-security.c:499
msgid "Tunneled TLS"
msgstr "Туннелированный TLS"
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: ../panels/network/wireless-security/wireless-security.c:510
msgid "Protected EAP (PEAP)"
msgstr "Защищённый EAP (PEAP)"
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
msgid "Au_thentication"
msgstr "А_утентификация"
@@ -3699,34 +3733,22 @@ msgid "1 (Default)"
msgstr "1 (по умолчанию)"
#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
msgid "Open System"
msgstr "Open System"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
msgid "Shared Key"
msgstr "Общий ключ"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
msgid "_Key"
msgstr "_Ключ"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
msgid "Sho_w key"
msgstr "_Показать ключ"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
msgid "WEP inde_x"
msgstr "_Индекс WEP"
@@ -3825,19 +3847,19 @@ msgstr "Другое"
#. translators: This is the title of the "Show Account" dialog. The
#. * %s is the name of the provider. e.g., 'Google'.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:580
+#: ../panels/online-accounts/cc-online-accounts-panel.c:603
#, c-format
msgid "%s Account"
msgstr "Учётная запись %s"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:872
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
msgid "Error removing account"
msgstr "Ошибка при удалении учётной записи"
#. Translators: The %s is the username (eg., debarshi ray gmail com
#. * or rishi).
#.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:937
+#: ../panels/online-accounts/cc-online-accounts-panel.c:960
#, c-format
msgid "<b>%s</b> removed"
msgstr "<b>%s</b> удалён"
@@ -3861,7 +3883,9 @@ msgstr ""
"Google;Facebook;Twitter;Yahoo;Web;Онлайн;Чат;Календарь;Почта;Контакт;"
"ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
+#. Translators: This is the button which allows undoing the removal of the printer.
#: ../panels/online-accounts/online-accounts.ui.h:1
+#: ../panels/printers/printers.ui.h:4
msgid "Undo"
msgstr "Отменить"
@@ -4014,7 +4038,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:2366
+#: ../panels/power/cc-power-panel.c:2356
msgid "Battery"
msgstr "Батарея"
@@ -4066,86 +4090,92 @@ msgstr "При п_ростое"
msgid "Power Saving"
msgstr "Энергосбережение"
-#: ../panels/power/cc-power-panel.c:1716
+#: ../panels/power/cc-power-panel.c:1712
msgid "_Screen brightness"
msgstr "Яркость _экрана"
-#: ../panels/power/cc-power-panel.c:1735
+#: ../panels/power/cc-power-panel.c:1731
msgid "Automatic brightness"
msgstr "Автоматическая регулировка яркости"
-#: ../panels/power/cc-power-panel.c:1755
+#: ../panels/power/cc-power-panel.c:1751
msgid "_Keyboard brightness"
msgstr "Яркость подсветки _клавиатуры"
-#: ../panels/power/cc-power-panel.c:1765
+#: ../panels/power/cc-power-panel.c:1761
msgid "_Dim screen when inactive"
msgstr "У_меньшать яркость экрана при простое"
-#: ../panels/power/cc-power-panel.c:1790
+#: ../panels/power/cc-power-panel.c:1786
msgid "_Blank screen"
msgstr "_Выключение экрана"
-#: ../panels/power/cc-power-panel.c:1827
+#: ../panels/power/cc-power-panel.c:1823
msgid "_Wi-Fi"
msgstr "_Wi-Fi"
-#: ../panels/power/cc-power-panel.c:1832
+#: ../panels/power/cc-power-panel.c:1828
msgid "Turn off Wi-Fi to save power."
msgstr "Выключите Wi-Fi для уменьшения энергопотребления."
-#: ../panels/power/cc-power-panel.c:1857
+#: ../panels/power/cc-power-panel.c:1853
msgid "_Mobile broadband"
msgstr "_Мобильный Интернет"
-#: ../panels/power/cc-power-panel.c:1862
+#: ../panels/power/cc-power-panel.c:1858
msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
msgstr ""
"Выключите адаптер мобильного широкополосного доступа (3G, 4G, WiMax и т.д.) "
"для уменьшения энергопотребления."
-#: ../panels/power/cc-power-panel.c:1907
+#: ../panels/power/cc-power-panel.c:1903
msgid "_Bluetooth"
msgstr "_Bluetooth"
-#: ../panels/power/cc-power-panel.c:1970
+#: ../panels/power/cc-power-panel.c:1966
msgid "When on battery power"
msgstr "При работе от батареи"
-#: ../panels/power/cc-power-panel.c:1972
+#: ../panels/power/cc-power-panel.c:1968
msgid "When plugged in"
msgstr "При подключении"
-#: ../panels/power/cc-power-panel.c:2067
+#: ../panels/power/cc-power-panel.c:2063
msgid "Suspend"
msgstr "Перевести в режим ожидания"
-#: ../panels/power/cc-power-panel.c:2068
+#: ../panels/power/cc-power-panel.c:2064
+#, fuzzy
+#| msgid "Power"
+msgid "Power Off"
+msgstr "Электропитание"
+
+#: ../panels/power/cc-power-panel.c:2065
msgid "Hibernate"
msgstr "Перевести в режим гибернации"
-#: ../panels/power/cc-power-panel.c:2069
+#: ../panels/power/cc-power-panel.c:2066
msgid "Nothing"
msgstr "Ничего не делать"
#. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: ../panels/power/cc-power-panel.c:2180
msgid "Suspend & Power Button"
msgstr "Режим ожидания и кнопка выключения"
-#: ../panels/power/cc-power-panel.c:2226
+#: ../panels/power/cc-power-panel.c:2219
msgid "_Automatic suspend"
msgstr "_Автоматический режим ожидания"
-#: ../panels/power/cc-power-panel.c:2227
+#: ../panels/power/cc-power-panel.c:2220
msgid "Automatic suspend"
msgstr "Автоматический режим ожидания"
-#: ../panels/power/cc-power-panel.c:2294
+#: ../panels/power/cc-power-panel.c:2287
msgid "_When the Power Button is pressed"
msgstr "_При нажатии кнопки выключения"
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:273
+#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
#: ../shell/panel-list.ui.h:1
msgid "Devices"
msgstr "Устройства"
@@ -4250,32 +4280,47 @@ msgstr "При _подключении"
msgid "On _Battery Power"
msgstr "При работе от _батареи"
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
msgid "Delay"
msgstr "Задержка"
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
#: ../panels/printers/authentication-dialog.ui.h:3
msgid "Authenticate"
msgstr "Аутентификация"
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "Имя пользователя"
+
#: ../panels/printers/authentication-dialog.ui.h:6
#: ../panels/printers/new-printer-dialog.ui.h:11
msgid "Authentication Required"
msgstr "Требуется аутентификация"
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:718
+#, c-format
+msgid "Printer “%s” has been deleted"
+msgstr ""
+
#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:713
+#: ../panels/printers/cc-printers-panel.c:909
msgid "Failed to add new printer."
msgstr "Не удалось добавить новый принтер."
#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:959
+#: ../panels/printers/cc-printers-panel.c:1221
#, c-format
msgid "Could not load ui: %s"
msgstr "Не удалось загрузить интерфейс пользователя: %s"
#: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:6
+#: ../panels/printers/printer-entry.ui.h:8
msgid "Location"
msgstr "Местоположение"
@@ -4352,9 +4397,14 @@ msgid "Enter username and password to view printers on Print Server."
msgstr ""
"Введите имя пользователя и пароль для просмотра принтеров на сервере печати."
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "Загрузка параметров…"
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+#, fuzzy
+#| msgid "Test page"
+msgid "Test Page"
+msgstr "Пробная страница"
#. Translators: This is the title of the dialog. %s is the printer name.
#: ../panels/printers/pp-details-dialog.c:123
@@ -4524,11 +4574,6 @@ msgstr "Последовательный порт"
msgid "Parallel Port"
msgstr "Параллельный порт"
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
#. Translators: Location of found network printer (e.g. Kitchen, Reception)
#: ../panels/printers/pp-new-printer-dialog.c:1853
#, c-format
@@ -4546,89 +4591,89 @@ msgstr "Адрес: %s"
msgid "Server requires authentication"
msgstr "Сервер требует аутентификацию"
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
msgid "Two Sided"
msgstr "Двусторонняя печать"
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
msgid "Paper Type"
msgstr "Тип бумаги"
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
msgid "Paper Source"
msgstr "Источники бумаги"
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
msgid "Output Tray"
msgstr "Приёмный лоток"
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
msgid "GhostScript pre-filtering"
msgstr "Предварительная фильтрация GhostScript"
#. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: ../panels/printers/pp-options-dialog.c:534
msgid "Pages per side"
msgstr "Страниц на сторону"
#. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: ../panels/printers/pp-options-dialog.c:546
msgid "Two-sided"
msgstr "Двусторонняя печать"
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
-msgid "Orientation"
-msgstr "Ориентация"
-
#. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:655
msgctxt "Printer Option Group"
msgid "General"
msgstr "Общие"
#. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:657
+#: ../panels/printers/pp-options-dialog.c:658
msgctxt "Printer Option Group"
msgid "Page Setup"
msgstr "Параметры страницы"
#. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM,
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:660
+#: ../panels/printers/pp-options-dialog.c:661
msgctxt "Printer Option Group"
msgid "Installable Options"
msgstr "Устанавливаемые параметры"
#. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: ../panels/printers/pp-options-dialog.c:664
msgctxt "Printer Option Group"
msgid "Job"
msgstr "Задание"
#. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:666
+#: ../panels/printers/pp-options-dialog.c:667
msgctxt "Printer Option Group"
msgid "Image Quality"
msgstr "Качество изображения"
#. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: ../panels/printers/pp-options-dialog.c:670
msgctxt "Printer Option Group"
msgid "Color"
msgstr "Цвет"
#. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: ../panels/printers/pp-options-dialog.c:673
msgctxt "Printer Option Group"
msgid "Finishing"
msgstr "Завершение"
#. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: ../panels/printers/pp-options-dialog.c:676
msgctxt "Printer Option Group"
msgid "Advanced"
msgstr "Дополнительно"
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "Пробная страница"
+
#. Translators: this is an option of "Paper Source"
#: ../panels/printers/pp-ppd-option-widget.c:76
#: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4671,12 +4716,12 @@ msgid "Manufacturer"
msgstr "Производитель"
#. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:443
+#: ../panels/printers/pp-printer-entry.c:577
msgid "No Active Jobs"
msgstr "Нет активных заданий"
#. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:448
+#: ../panels/printers/pp-printer-entry.c:582
#, c-format
msgid "%u Job"
msgid_plural "%u Jobs"
@@ -4685,109 +4730,114 @@ msgstr[1] "%u задания"
msgstr[2] "%u заданий"
#. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:584
+#: ../panels/printers/pp-printer-entry.c:730
msgid "Low on toner"
msgstr "Мало тонера"
#. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:586
+#: ../panels/printers/pp-printer-entry.c:732
msgid "Out of toner"
msgstr "Тонер закончился"
#. Translators: "Developer" is a chemical for photo development,
#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:589
+#: ../panels/printers/pp-printer-entry.c:735
msgid "Low on developer"
msgstr "Мало проявителя"
#. Translators: "Developer" is a chemical for photo development,
#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:592
+#: ../panels/printers/pp-printer-entry.c:738
msgid "Out of developer"
msgstr "Проявитель закончился"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:594
+#: ../panels/printers/pp-printer-entry.c:740
msgid "Low on a marker supply"
msgstr "Маркер скоро закончится"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:596
+#: ../panels/printers/pp-printer-entry.c:742
msgid "Out of a marker supply"
msgstr "Маркер закончился"
#. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:598
+#: ../panels/printers/pp-printer-entry.c:744
msgid "Open cover"
msgstr "Открыта крышка"
#. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:600
+#: ../panels/printers/pp-printer-entry.c:746
msgid "Open door"
msgstr "Открыта дверца"
#. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:602
+#: ../panels/printers/pp-printer-entry.c:748
msgid "Low on paper"
msgstr "Мало бумаги"
#. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:604
+#: ../panels/printers/pp-printer-entry.c:750
msgid "Out of paper"
msgstr "Бумага закончилась"
#. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:606
+#: ../panels/printers/pp-printer-entry.c:752
msgctxt "printer state"
msgid "Offline"
msgstr "Выключен"
#. Translators: Someone has stopped the Printer
#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/pp-printer-entry.c:608
-#: ../panels/printers/pp-printer-entry.c:738
+#: ../panels/printers/pp-printer-entry.c:754
+#: ../panels/printers/pp-printer-entry.c:884
msgctxt "printer state"
msgid "Stopped"
msgstr "Остановлен"
#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:610
+#: ../panels/printers/pp-printer-entry.c:756
msgid "Waste receptacle almost full"
msgstr "Резервуар почти полон"
#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:612
+#: ../panels/printers/pp-printer-entry.c:758
msgid "Waste receptacle full"
msgstr "Резервуар заполнен"
#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:614
+#: ../panels/printers/pp-printer-entry.c:760
msgid "The optical photo conductor is near end of life"
msgstr "Фотобарабан скоро выйдет из строя"
#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:616
+#: ../panels/printers/pp-printer-entry.c:762
msgid "The optical photo conductor is no longer functioning"
msgstr "Фотобарабан перестал работать"
#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/pp-printer-entry.c:724
+#: ../panels/printers/pp-printer-entry.c:870
msgctxt "printer state"
msgid "Ready"
msgstr "Готов"
#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/pp-printer-entry.c:729
+#: ../panels/printers/pp-printer-entry.c:875
msgctxt "printer state"
msgid "Does not accept jobs"
msgstr "Не принимает задания"
#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:734
+#: ../panels/printers/pp-printer-entry.c:880
msgctxt "printer state"
msgid "Processing"
msgstr "Обработка"
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+msgid "Clean print heads"
+msgstr "Очистка печатающих головок принтера"
+
#: ../panels/printers/printer-entry.ui.h:1
msgid "Printing Options"
msgstr "Параметры печати"
@@ -4798,27 +4848,32 @@ msgstr "Сведения о принтере"
#: ../panels/printers/printer-entry.ui.h:3
msgid "Use Printer by Default"
-msgstr "Использовать как принтер по умолчанию"
+msgstr "Использовать по умолчанию"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:5
+msgid "Clean Print Heads"
+msgstr "Очистить печатающие головки"
-#: ../panels/printers/printer-entry.ui.h:4
+#: ../panels/printers/printer-entry.ui.h:6
msgid "Remove Printer"
msgstr "Удалить принтер"
-#: ../panels/printers/printer-entry.ui.h:5
+#: ../panels/printers/printer-entry.ui.h:7
msgid "Model"
msgstr "Модель"
-#: ../panels/printers/printer-entry.ui.h:7
+#: ../panels/printers/printer-entry.ui.h:9
msgid "Ink Level"
msgstr "Уровень чернил"
#. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:9
+#: ../panels/printers/printer-entry.ui.h:11
msgid "Please restart when the problem is resolved."
msgstr "Запустите снова когда проблема будет решена."
#. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:11
+#: ../panels/printers/printer-entry.ui.h:13
msgid "Restart"
msgstr "Перезапустить"
@@ -4827,17 +4882,17 @@ msgstr "Перезапустить"
msgid "Add…"
msgstr "Добавить…"
-#: ../panels/printers/printers.ui.h:3
+#: ../panels/printers/printers.ui.h:5
msgid "No printers"
msgstr "Принтеров нет"
#. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:5
+#: ../panels/printers/printers.ui.h:7
msgid "Add a Printer…"
msgstr "Добавить принтер…"
#. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:7
+#: ../panels/printers/printers.ui.h:9
msgid ""
"Sorry! The system printing service\n"
"doesn’t seem to be available."
@@ -5091,17 +5146,17 @@ msgstr "_Сервисы местоположения"
msgid "_Automatic Problem Reporting"
msgstr "_Автоматическое сообщение об ошибках"
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:118
msgctxt "measurement format"
msgid "Imperial"
msgstr "Имперская"
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
msgctxt "measurement format"
msgid "Metric"
msgstr "Метрическая"
-#: ../panels/region/cc-format-chooser.c:287
+#: ../panels/region/cc-format-chooser.c:285
msgid "No regions found"
msgstr "Регионы не найдены"
@@ -5109,16 +5164,16 @@ msgstr "Регионы не найдены"
msgid "No input sources found"
msgstr "Источники ввода не найдены"
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
msgctxt "Input Source"
msgid "Other"
msgstr "Другое"
-#: ../panels/region/cc-region-panel.c:866
+#: ../panels/region/cc-region-panel.c:881
msgid "No input source selected"
msgstr "Не выбран источник ввода"
-#: ../panels/region/cc-region-panel.c:1757
+#: ../panels/region/cc-region-panel.c:1773
msgid "Login _Screen"
msgstr "_Экран входа"
@@ -5139,14 +5194,20 @@ msgid "Times"
msgstr "Время"
#: ../panels/region/format-chooser.ui.h:7
+#, fuzzy
+#| msgid "Date & Time"
+msgid "Dates & Times"
+msgstr "Дата и время"
+
+#: ../panels/region/format-chooser.ui.h:8
msgid "Numbers"
msgstr "Числа"
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
msgid "Measurement"
msgstr "Система мер"
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
msgid "Paper"
msgstr "Бумага"
@@ -5215,24 +5276,26 @@ msgid "Left+Right Alt"
msgstr "Левый+Правый Alt"
#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "Необходимо перезапустить сеанс, чтобы изменения вступили в силу"
-
-#: ../panels/region/region.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Restart Now"
-msgstr "Перезапустить сейчас"
-
-#: ../panels/region/region.ui.h:3
#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
msgid "_Language"
msgstr "_Язык"
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:2
msgid "English (United Kingdom)"
msgstr "Английский (Великобритания)"
+#: ../panels/region/region.ui.h:3
+#, fuzzy
+#| msgid "Your session needs to be restarted for changes to take effect"
+msgid "Restart the session for changes to take effect"
+msgstr "Необходимо перезапустить сеанс, чтобы изменения вступили в силу"
+
+#: ../panels/region/region.ui.h:4
+#, fuzzy
+#| msgid "Restart"
+msgid "Restart…"
+msgstr "Перезапустить"
+
#: ../panels/region/region.ui.h:5
msgid "_Formats"
msgstr "_Форматы"
@@ -5277,15 +5340,15 @@ msgstr "Показать раскладку источника ввода"
msgid "Login settings are used by all users when logging into the system"
msgstr "Параметры входа в систему используются всеми пользователями"
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: ../panels/search/cc-search-locations-dialog.c:639
msgid "Select Location"
msgstr "Выберите расположение"
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
msgid "_OK"
msgstr "_ОК"
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
msgid "No applications found"
msgstr "Приложения не найдены"
@@ -5604,7 +5667,7 @@ msgstr "_Профиль:"
#. translators:
#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
+#: ../panels/sound/gvc/gvc-mixer-control.c:1873
#, c-format
msgid "%u Output"
msgid_plural "%u Outputs"
@@ -5614,7 +5677,7 @@ msgstr[2] "%u выходов"
#. translators:
#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
+#: ../panels/sound/gvc/gvc-mixer-control.c:1883
#, c-format
msgid "%u Input"
msgid_plural "%u Inputs"
@@ -5622,7 +5685,7 @@ msgstr[0] "%u вход"
msgstr[1] "%u входа"
msgstr[2] "%u входов"
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
msgid "System Sounds"
msgstr "Системные звуки"
@@ -5734,6 +5797,41 @@ msgstr "Сабвуфер"
msgid "Custom"
msgstr "Другой"
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: ../panels/universal-access/cc-ua-panel.c:351
+msgctxt "cursor size"
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../panels/universal-access/cc-ua-panel.c:354
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "Средний"
+
+#: ../panels/universal-access/cc-ua-panel.c:357
+msgctxt "cursor size"
+msgid "Large"
+msgstr "Увеличенный"
+
+#: ../panels/universal-access/cc-ua-panel.c:360
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "Большой"
+
+#: ../panels/universal-access/cc-ua-panel.c:363
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "Огромный"
+
+#: ../panels/universal-access/cc-ua-panel.c:367
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d пиксель"
+msgstr[1] "%d пикселя"
+msgstr[2] "%d пикселей"
+
#. 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"
@@ -5747,9 +5845,13 @@ msgstr ""
#. Translators: those are keywords for the universal access control-center panel
#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#, fuzzy
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
+#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
msgid ""
"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
msgstr ""
"Клавиатура;Мышь;a11y;Специальные;возможности;Контрастность;Масштаб;Экран;"
"Чтение;текст;шрифт;размер;AccessX;Залипающие;клавиши;Медленные;Отскакивающие;"
@@ -5772,282 +5874,297 @@ msgid "_Large Text"
msgstr "_Крупный текст"
#: ../panels/universal-access/uap.ui.h:5
+msgid "C_ursor Size"
+msgstr "Размер _курсора"
+
+#: ../panels/universal-access/uap.ui.h:6
#: ../panels/universal-access/zoom-options.ui.h:7
msgid "_Zoom"
msgstr "_Масштабирование"
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:8
msgid "Screen _Reader"
msgstr "_Чтение с экрана"
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:9
msgid "_Sound Keys"
msgstr "_Звук при нажатии клавиш"
-#: ../panels/universal-access/uap.ui.h:9
+#: ../panels/universal-access/uap.ui.h:10
msgid "Hearing"
msgstr "Слух"
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:11
msgid "_Visual Alerts"
msgstr "_Визуальные уведомления"
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:13
msgid "Screen _Keyboard"
msgstr "_Экранная клавиатура"
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:14
msgid "R_epeat Keys"
msgstr "_Автоповтор клавиш"
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:15
msgid "Cursor _Blinking"
msgstr "_Мигание курсора"
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:16
msgid "_Typing Assist (AccessX)"
msgstr "Помощник ввода (AccessX)"
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:17
msgid "Pointing & Clicking"
msgstr "Наведение и нажатие"
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:18
msgid "_Mouse Keys"
msgstr "_Клавиши мыши"
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:19
msgid "_Click Assist"
msgstr "Помощник _нажатия"
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:20
msgid "_Double-Click Delay"
msgstr "Задержка _двойного нажатия"
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:21
msgid "Double-Click Delay"
msgstr "Задержка двойного нажатия"
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:22
+msgid "Cursor Size"
+msgstr "Размер курсора"
+
+#: ../panels/universal-access/uap.ui.h:23
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr ""
+"Размер курсора можно выбрать в соответствии с масштабом для улучшения его "
+"видимости."
+
+#: ../panels/universal-access/uap.ui.h:24
msgid "Screen Reader"
msgstr "Чтение с экрана"
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:25
msgid "The screen reader reads displayed text as you move the focus."
msgstr ""
"Приложение для чтения с экрана читает отображённый текст при перемещении "
"фокуса."
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:26
msgid "_Screen Reader"
msgstr "_Чтение с экрана"
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:27
msgid "Sound Keys"
msgstr "Озвучивание клавиши"
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:28
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
+#: ../panels/universal-access/uap.ui.h:29
msgid "Visual Alerts"
msgstr "Визуальные уведомления"
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:30
msgid "_Test flash"
msgstr "_Проверить мигание"
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:31
msgid "Use a visual indication when an alert sound occurs."
msgstr "Использовать визуальную индикацию для звуковых уведомлений."
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:32
msgid "Flash the _window title"
msgstr "Мигать _заголовком окна"
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:33
msgid "Flash the entire _screen"
msgstr "Мигать всем _экраном"
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:34
msgid "Repeat Keys"
msgstr "Автоповтор клавиш"
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:35
msgid "Key presses repeat when key is held down."
msgstr "Повторять нажатую удерживаемую клавишу."
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:37
msgid "Repeat keys delay"
msgstr "Задержка повтора клавиш"
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:38
msgid "Speed"
msgstr "Скорость"
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:39
msgid "Repeat keys speed"
msgstr "Скорость повтора клавиш"
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:40
msgid "Cursor Blinking"
msgstr "Мигание курсора"
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:41
msgid "Cursor blinks in text fields."
msgstr "Курсор мигает в текстовых полях ввода."
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:42
msgid "Cursor blinking speed"
msgstr "Частота мигания курсора"
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:43
msgid "Typing Assist"
msgstr "Помощник ввода"
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:44
msgid "_Sticky Keys"
msgstr "_Залипающие клавиши"
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:45
msgid "Treats a sequence of modifier keys as a key combination"
msgstr "Обрабатывает последовательность модификаторов как комбинацию клавиш"
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:46
msgid "_Disable if two keys are pressed together"
msgstr "_Отключать, если две клавиши нажаты вместе"
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:47
msgid "Beep when a _modifier key is pressed"
msgstr "Подавать сигнал при нажатии _модификатора"
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:48
msgid "S_low Keys"
msgstr "_Медленные клавиши"
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:49
msgid "Puts a delay between when a key is pressed and when it is accepted"
msgstr "Вставляет задержку между нажатием клавиши и его обработкой"
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:50
msgid "A_cceptance delay:"
msgstr "За_держка принятия:"
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:51
msgctxt "slow keys delay"
msgid "Short"
msgstr "Короткая"
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:52
msgid "Slow keys typing delay"
msgstr "Задержка ввода «медленных» клавиш"
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:53
msgctxt "slow keys delay"
msgid "Long"
msgstr "Длинная"
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:54
msgid "Beep when a key is pr_essed"
msgstr "Подавать сигнал при _нажатии клавиши"
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:55
msgid "Beep when a key is _accepted"
msgstr "Подавать сигнал при _отпускании клавиши"
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:56
msgid "Beep when a key is _rejected"
msgstr "Подавать сигнал при _игнорировании клавиш"
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:57
msgid "_Bounce Keys"
msgstr "_Отскакивающие клавиши"
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:58
msgid "Ignores fast duplicate keypresses"
msgstr "Игнорирует быстрые нажатия клавиш"
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:59
msgctxt "bounce keys delay"
msgid "Short"
msgstr "Короткая"
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:60
msgid "Bounce keys typing delay"
msgstr "Задержка ввода «отскакивающих» клавиш"
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:61
msgctxt "bounce keys delay"
msgid "Long"
msgstr "Длинная"
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:62
msgid "_Enable by Keyboard"
msgstr "_Управляется клавиатурой"
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:63
msgid "Turn accessibility features on and off using the keyboard"
msgstr "Включать и выключать специальные возможности с помощью клавиатуры"
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:64
msgid "Click Assist"
msgstr "Помощник нажатия"
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:65
msgid "_Simulated Secondary Click"
msgstr "_Симуляция вторичного нажатия"
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:66
msgid "Trigger a secondary click by holding down the primary button"
msgstr "Двойное нажатие удержанием главной кнопки"
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:67
msgctxt "secondary click"
msgid "Short"
msgstr "Короткая"
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:68
msgid "Secondary click delay"
msgstr "Задержка вторичного нажатия"
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:69
msgctxt "secondary click delay"
msgid "Long"
msgstr "Длинная"
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:70
msgid "_Hover Click"
msgstr "Нажатие при на_ведении"
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:71
msgid "Trigger a click when the pointer hovers"
msgstr "Нажатие при наведении указателя"
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:72
msgid "D_elay:"
msgstr "За_держка:"
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:73
msgctxt "dwell click delay"
msgid "Short"
msgstr "Короткая"
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:74
msgctxt "dwell click delay"
msgid "Long"
msgstr "Длинная"
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:75
msgid "Motion _threshold:"
msgstr "Двигательный _порог:"
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:76
msgctxt "dwell click threshold"
msgid "Small"
msgstr "Уменьшенный"
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:77
msgctxt "dwell click threshold"
msgid "Large"
msgstr "Увеличенный"
@@ -6423,6 +6540,14 @@ msgstr "Установите пароль сейчас"
msgid "_Add User…"
msgstr "_Добавить пользователя…"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Необходимо перезапустить сеанс, чтобы изменения вступили в силу"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "Перезапустить сейчас"
+
#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
msgid "A_utomatic Login"
msgstr "Автоматический в_ход"
@@ -6539,8 +6664,12 @@ msgstr "Старайтесь избегать последовательност
#: ../panels/user-accounts/pw-utils.c:115
msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "Попробуйте добавить ещё буквы, цифры и символы."
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr ""
+"Пароль должен быть длиннее. Попробуйте добавить больше букв, цифр и знаков "
+"препинания."
#: ../panels/user-accounts/pw-utils.c:117
msgctxt "Password hint"
@@ -6550,41 +6679,10 @@ msgstr "Смешайте заглавные и строчные буквы не
#: ../panels/user-accounts/pw-utils.c:119
msgctxt "Password hint"
msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
+"Adding more letters, numbers and punctuation will make the password stronger."
msgstr ""
-"Хороший пароль! Добавление большего количества букв, цифр и знаков "
-"препинания сделает его надёжнее."
-
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "Надёжность: очень слабая"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "Надёжность: слабая"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "Надёжность: средняя"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "Надёжность: хорошая"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "Надёжность: высокая"
+"Добавление большего количества букв, цифр и знаков препинания сделает пароль "
+"надёжнее."
#: ../panels/user-accounts/run-passwd.c:422
msgid "Authentication failed"
@@ -6643,25 +6741,25 @@ msgstr "Должно совпадать с веб-адресом провайд
msgid "Failed to add account"
msgstr "Не удалось добавить учётную запись"
-#: ../panels/user-accounts/um-account-dialog.c:463
+#: ../panels/user-accounts/um-account-dialog.c:462
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: ../panels/user-accounts/um-account-dialog.c:718
-#: ../panels/user-accounts/um-account-dialog.c:764
-#: ../panels/user-accounts/um-account-dialog.c:785
+#: ../panels/user-accounts/um-account-dialog.c:717
+#: ../panels/user-accounts/um-account-dialog.c:763
+#: ../panels/user-accounts/um-account-dialog.c:784
msgid "Failed to register account"
msgstr "Не удалось зарегистрировать учётную запись"
-#: ../panels/user-accounts/um-account-dialog.c:908
+#: ../panels/user-accounts/um-account-dialog.c:907
msgid "No supported way to authenticate with this domain"
msgstr "Нет поддерживаемого метода аутентификации в этом домене"
-#: ../panels/user-accounts/um-account-dialog.c:981
+#: ../panels/user-accounts/um-account-dialog.c:980
msgid "Failed to join domain"
msgstr "Не удалось подключить к домену"
-#: ../panels/user-accounts/um-account-dialog.c:1042
+#: ../panels/user-accounts/um-account-dialog.c:1041
msgid ""
"That login name didn’t work.\n"
"Please try again."
@@ -6669,7 +6767,7 @@ msgstr ""
"Неправильное имя пользователя.\n"
"Попробуйте ещё раз."
-#: ../panels/user-accounts/um-account-dialog.c:1049
+#: ../panels/user-accounts/um-account-dialog.c:1048
msgid ""
"That login password didn’t work.\n"
"Please try again."
@@ -6677,12 +6775,12 @@ msgstr ""
"Неправильный пароль.\n"
"Попробуйте ещё раз."
-#: ../panels/user-accounts/um-account-dialog.c:1057
+#: ../panels/user-accounts/um-account-dialog.c:1056
msgid "Failed to log into domain"
msgstr "Не удалось войти в домен"
-#: ../panels/user-accounts/um-account-dialog.c:1115
-msgid "Unable find the domain. Maybe you misspelled it?"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+msgid "Unable to find the domain. Maybe you misspelled it?"
msgstr "Не удалось найти домен. Может быть, он написан с ошибкой?"
#: ../panels/user-accounts/um-account-type.c:34
@@ -6845,39 +6943,39 @@ msgstr "Сеанс начат"
msgid "%s — Account Activity"
msgstr "%s — активность учётной записи"
-#: ../panels/user-accounts/um-password-dialog.c:145
+#: ../panels/user-accounts/um-password-dialog.c:144
msgid "Please choose another password."
msgstr "Выберите другой пароль."
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
msgid "Please type your current password again."
msgstr "Введите пароль ещё раз."
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
msgid "Password could not be changed"
msgstr "Не удалось изменить пароль"
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
msgid "The passwords do not match."
msgstr "Пароли не совпадают."
-#: ../panels/user-accounts/um-photo-dialog.c:215
+#: ../panels/user-accounts/um-photo-dialog.c:218
msgid "Browse for more pictures"
msgstr "Найти дополнительные изображения"
-#: ../panels/user-accounts/um-photo-dialog.c:449
+#: ../panels/user-accounts/um-photo-dialog.c:452
msgid "Disable image"
msgstr "Выключить изображение"
-#: ../panels/user-accounts/um-photo-dialog.c:467
+#: ../panels/user-accounts/um-photo-dialog.c:470
msgid "Take a photo…"
msgstr "Сделать фотоснимок…"
-#: ../panels/user-accounts/um-photo-dialog.c:485
+#: ../panels/user-accounts/um-photo-dialog.c:488
msgid "Browse for more pictures…"
msgstr "Найти дополнительные изображения…"
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:714
#, c-format
msgid "Used by %s"
msgstr "Используется %s"
@@ -7062,6 +7160,11 @@ msgstr ""
msgid "Map Buttons"
msgstr "Отображение кнопок"
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+msgid "_Close"
+msgstr "_Закрыть"
+
#: ../panels/wacom/button-mapping.ui.h:3
msgid "Map buttons to functions"
msgstr "Соответствие кнопок и функций"
@@ -7131,7 +7234,7 @@ msgstr "Отображение на один экран"
msgid "%d of %d"
msgstr "%d из %d"
-#: ../panels/wacom/cc-wacom-page.c:502
+#: ../panels/wacom/cc-wacom-page.c:544
msgid "Display Mapping"
msgstr "Отображение на экран"
@@ -7280,11 +7383,27 @@ msgstr "Чувствительность нажатия пера"
msgid "page 3"
msgstr "страница 3"
-#: ../shell/alt/cc-window.c:766 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1484
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:730
msgid "All Settings"
msgstr "Все параметры"
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "Персональные"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "Оборудование"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "Система"
+
#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
msgid "GNOME Control Center"
msgstr "Центр управления GNOME"
@@ -7341,22 +7460,6 @@ msgstr "Справка"
msgid "Quit"
msgstr "Завершить"
-#. Add categories
-#: ../shell/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "Персональные"
-
-#: ../shell/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "Оборудование"
-
-#: ../shell/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "Система"
-
#: ../shell/gnome-control-center.desktop.in.in.h:2
msgid "Preferences;Settings;"
msgstr "Настройки;Параметры;"
@@ -7401,6 +7504,207 @@ msgstr "Точка доступа"
msgid "No results found"
msgstr "Результатов не найдено"
+#~ msgid "Lid Closed"
+#~ msgstr "Крышка ноутбука закрыта"
+
+#~ msgid "Mirrored"
+#~ msgstr "Дублируемый"
+
+#~ msgid "Primary"
+#~ msgstr "Основной"
+
+#~ msgid "Secondary"
+#~ msgstr "Дополнительный"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "Упорядочить сгруппированные экраны"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "Перетащите экраны, чтобы изменить их порядок"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Гц (NTSC)"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Гц"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "Повернуть против часовой стрелки на 90°"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "Повернуть на 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "Повернуть по часовой стрелке на 90°"
+
+#~ msgid "Size"
+#~ msgstr "Размер"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "Соотношение сторон"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "Показывать верхнюю панель и режим обзора на этом дисплее"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr ""
+#~ "Объединить этот дисплей с другим для увеличения рабочего пространства"
+
+#~ msgid "Presentation"
+#~ msgstr "Презентация"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "Показывать только слайд-шоу и мультимедиа"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "Показывать текущий вид на обоих дисплеях"
+
+#~ msgid "Turn Off"
+#~ msgstr "Выключить"
+
+#~ msgid "Don’t use this display"
+#~ msgstr "Не использовать этот монитор"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "_Расположить объединённые дисплеи"
+
+#~ msgid "Server"
+#~ msgstr "Сервер"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "Удалить сервер DNS"
+
+#~ msgid "Reset"
+#~ msgstr "Сбросить"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "Сделать доступным для других _пользователей"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr ""
+#~ "Сбросить параметры этой сети, включая пароли, и запомнить её в качестве "
+#~ "предпочтительной сети"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr ""
+#~ "Удалить все параметры, относящиеся к этой сети, и не пытаться "
+#~ "автоматически подключаться к этой сети"
+
+#~ 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."
+#~ msgstr ""
+#~ "Если помимо беспроводного доступа в Интернет имеется ещё какое-либо "
+#~ "подключение к Интернету, беспроводную точку доступа можно настроить для "
+#~ "подключения к Интернету других пользователей."
+
+#~ msgid "History"
+#~ msgstr "История"
+
+#~ msgid "Proxy"
+#~ msgstr "Прокси"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "_Добавить профиль…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "Отсутствует"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "Ручной"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "Автоматический"
+
+#~ msgid "Add Device"
+#~ msgstr "Добавить устройство"
+
+#~ msgid "Remove Device"
+#~ msgstr "Удалить устройство"
+
+#~ msgid "VPN Type"
+#~ msgstr "Тип VPN"
+
+#~ msgid "Group Name"
+#~ msgstr "Имя группы"
+
+#~ msgid "Group Password"
+#~ msgstr "Пароль группы"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "_Сделать точкой доступа…"
+
+#~ msgid "_History"
+#~ msgstr "_История"
+
+#~ msgid "Loading options…"
+#~ msgstr "Загрузка параметров…"
+
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d-бит (ID сборки: %s)"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d-бит"
+
+#~ msgid "Base system"
+#~ msgstr "Базовая система"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Комбинация;Повтор;Мигание;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "Нажмите клавишу Esc для отмены."
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "_Зона брандмауэра"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "По умолчанию"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "Зона определяет уровень доверия соединению"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "Попробуйте добавить ещё буквы, цифры и символы."
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "Надёжность: очень слабая"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "Надёжность: слабая"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "Надёжность: средняя"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "Надёжность: хорошая"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "Надёжность: высокая"
+
#~ msgid "Edit"
#~ msgstr "Правка"
@@ -7469,9 +7773,6 @@ msgstr "Результатов не найдено"
#~ msgstr[1] "%u активных"
#~ msgstr[2] "%u активных"
-#~ msgid "Test page"
-#~ msgstr "Пробная страница"
-
#~ msgid "Supply"
#~ msgstr "Ресурс"
@@ -7737,9 +8038,6 @@ msgstr "Результатов не найдено"
#~ msgid "_Sign In"
#~ msgstr "_Войти"
-#~ msgid "Power"
-#~ msgstr "Электропитание"
-
#~ msgid "Privacy"
#~ msgstr "Конфиденциальность"
@@ -7774,9 +8072,6 @@ msgstr "Результатов не найдено"
#~ msgid "Pause Printing"
#~ msgstr "Приостановить печать"
-#~ msgid "Cancel Print Job"
-#~ msgstr "Отменить задание"
-
#~ msgctxt "print job"
#~ msgid "Held"
#~ msgstr "Удержано"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
