aboutsummaryrefslogtreecommitdiffstats
path: root/view/ru/hmessages.po
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2021-12-18 00:39:47 +0200
committerMax Kostikov <max@kostikov.co>2021-12-18 00:39:47 +0200
commit9c790e5a900b3b3ea3746b761ffad6d8f30eda24 (patch)
treebb3a261f771df793c854ab11c5909e9a7224cdf4 /view/ru/hmessages.po
parent8ab464acf28ae65d80ff0ab91266c1299ad21ac8 (diff)
downloadvolse-hubzilla-9c790e5a900b3b3ea3746b761ffad6d8f30eda24.tar.gz
volse-hubzilla-9c790e5a900b3b3ea3746b761ffad6d8f30eda24.tar.bz2
volse-hubzilla-9c790e5a900b3b3ea3746b761ffad6d8f30eda24.zip
Update Russian translation
Diffstat (limited to 'view/ru/hmessages.po')
-rw-r--r--view/ru/hmessages.po3483
1 files changed, 1842 insertions, 1641 deletions
diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po
index 2a856aa2f..ec63bc1ba 100644
--- a/view/ru/hmessages.po
+++ b/view/ru/hmessages.po
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 6.2RC\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-05 20:30+0200\n"
-"PO-Revision-Date: 2021-10-05 20:35+0200\n"
+"POT-Creation-Date: 2021-12-17 23:32+0200\n"
+"PO-Revision-Date: 2021-12-17 23:40+0200\n"
"Last-Translator: Max Kostikov <max@kostikov.co>\n"
"Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -18,59 +18,69 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))\n"
-#: ../../boot.php:1704
+#: ../../boot.php:1705
msgid "Create an account to access services and applications"
msgstr "Создайте аккаунт для доступа к службам и приложениям"
-#: ../../boot.php:1705 ../../Zotlabs/Module/Register.php:542
-#: ../../include/nav.php:165
+#: ../../boot.php:1706 ../../Zotlabs/Module/Register.php:542
+#: ../../include/nav.php:163
msgid "Register"
msgstr "Регистрация"
-#: ../../boot.php:1722
+#: ../../boot.php:1723
msgid "Email or nickname"
msgstr "Электронная почта или псевдоним"
-#: ../../boot.php:1722 ../../extend/addon/hzaddons/redred/Mod_Redred.php:73
+#: ../../boot.php:1723 ../../extend/addon/hzaddons/redred/Mod_Redred.php:73
#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:54
msgid "Nickname"
msgstr "Псевдоним"
-#: ../../boot.php:1727 ../../include/nav.php:109 ../../include/nav.php:139
-#: ../../include/nav.php:160
+#: ../../boot.php:1728 ../../include/nav.php:107 ../../include/nav.php:137
+#: ../../include/nav.php:158
msgid "Logout"
msgstr "Выход"
-#: ../../boot.php:1728 ../../Zotlabs/Lib/Apps.php:342 ../../include/nav.php:124
-#: ../../include/nav.php:128
+#: ../../boot.php:1729 ../../Zotlabs/Lib/Apps.php:342 ../../include/nav.php:122
+#: ../../include/nav.php:126
msgid "Login"
msgstr "Войти"
-#: ../../boot.php:1729 ../../Zotlabs/Module/Rmagic.php:96
-#: ../../include/channel.php:2561
+#: ../../boot.php:1730 ../../Zotlabs/Module/Rmagic.php:96
+#: ../../include/channel.php:2610
msgid "Remote Authentication"
msgstr "Удаленная аутентификация"
-#: ../../boot.php:1732
+#: ../../boot.php:1733
msgid "Password"
msgstr "Пароль"
-#: ../../boot.php:1733
+#: ../../boot.php:1734
msgid "Remember me"
msgstr "Запомнить меня"
-#: ../../boot.php:1733 ../../Zotlabs/Module/Register.php:512
+#: ../../boot.php:1734 ../../Zotlabs/Module/Register.php:512
#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Admin/Site.php:319
#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
-#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Defperms.php:196
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Filestorage.php:203
+#: ../../Zotlabs/Module/Profiles.php:701 ../../Zotlabs/Module/Profiles.php:711
+#: ../../Zotlabs/Module/Profiles.php:719 ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Api.php:99
+#: ../../Zotlabs/Module/Filestorage.php:203
#: ../../Zotlabs/Module/Filestorage.php:211
+#: ../../Zotlabs/Module/Permcats.php:232
+#: ../../Zotlabs/Module/Settings/Privacy.php:120
+#: ../../Zotlabs/Module/Settings/Privacy.php:121
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
#: ../../Zotlabs/Module/Settings/Display.php:86
-#: ../../Zotlabs/Module/Settings/Channel.php:313
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Import.php:591 ../../Zotlabs/Module/Import.php:595
-#: ../../Zotlabs/Module/Import.php:596 ../../Zotlabs/Module/Connedit.php:401
-#: ../../Zotlabs/Module/Connedit.php:781 ../../Zotlabs/Module/Mitem.php:176
+#: ../../Zotlabs/Module/Settings/Channel.php:219
+#: ../../Zotlabs/Module/Contactedit.php:284
+#: ../../Zotlabs/Module/Contactedit.php:329 ../../Zotlabs/Module/Menu.php:163
+#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Import.php:600
+#: ../../Zotlabs/Module/Import.php:604 ../../Zotlabs/Module/Import.php:605
+#: ../../Zotlabs/Module/Group.php:151 ../../Zotlabs/Module/Group.php:152
+#: ../../Zotlabs/Module/Group.php:163 ../../Zotlabs/Module/Group.php:275
+#: ../../Zotlabs/Module/Group.php:330 ../../Zotlabs/Module/Group.php:331
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Mitem.php:176
#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Wiki.php:224
#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Storage/Browser.php:310
@@ -78,7 +88,7 @@ msgstr "Запомнить меня"
#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391
#: ../../Zotlabs/Storage/Browser.php:552 ../../Zotlabs/Lib/Libzotdir.php:165
#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168
-#: ../../include/conversation.php:1472
+#: ../../include/conversation.php:1486
#: ../../view/theme/redbasic/php/config.php:99
#: ../../view/theme/redbasic/php/config.php:116
#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:111
@@ -97,9 +107,9 @@ msgstr "Запомнить меня"
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:362
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:438
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:462
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:66
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:650
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:654
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:67
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:651
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:655
#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:153
#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:425
#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:87
@@ -132,17 +142,26 @@ msgstr "Запомнить меня"
msgid "No"
msgstr "Нет"
-#: ../../boot.php:1733 ../../Zotlabs/Module/Register.php:512
+#: ../../boot.php:1734 ../../Zotlabs/Module/Register.php:512
#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Admin/Site.php:321
#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
-#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Defperms.php:196
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Filestorage.php:203
+#: ../../Zotlabs/Module/Profiles.php:701 ../../Zotlabs/Module/Profiles.php:711
+#: ../../Zotlabs/Module/Profiles.php:719 ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Api.php:98
+#: ../../Zotlabs/Module/Filestorage.php:203
#: ../../Zotlabs/Module/Filestorage.php:211
+#: ../../Zotlabs/Module/Permcats.php:232
+#: ../../Zotlabs/Module/Settings/Privacy.php:120
+#: ../../Zotlabs/Module/Settings/Privacy.php:121
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
#: ../../Zotlabs/Module/Settings/Display.php:86
-#: ../../Zotlabs/Module/Settings/Channel.php:313
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Import.php:591 ../../Zotlabs/Module/Import.php:595
-#: ../../Zotlabs/Module/Import.php:596 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Settings/Channel.php:219
+#: ../../Zotlabs/Module/Contactedit.php:284 ../../Zotlabs/Module/Menu.php:163
+#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Import.php:600
+#: ../../Zotlabs/Module/Import.php:604 ../../Zotlabs/Module/Import.php:605
+#: ../../Zotlabs/Module/Group.php:151 ../../Zotlabs/Module/Group.php:152
+#: ../../Zotlabs/Module/Group.php:163 ../../Zotlabs/Module/Group.php:275
+#: ../../Zotlabs/Module/Group.php:330 ../../Zotlabs/Module/Group.php:331
#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
#: ../../Zotlabs/Module/Wiki.php:224 ../../Zotlabs/Module/Wiki.php:225
@@ -150,7 +169,7 @@ msgstr "Нет"
#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1472
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1486
#: ../../view/theme/redbasic/php/config.php:99
#: ../../view/theme/redbasic/php/config.php:116
#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:111
@@ -169,9 +188,9 @@ msgstr "Нет"
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:361
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:437
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:461
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:66
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:650
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:654
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:67
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:651
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:655
#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:153
#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:425
#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:87
@@ -204,55 +223,55 @@ msgstr "Нет"
msgid "Yes"
msgstr "Да"
-#: ../../boot.php:1736
+#: ../../boot.php:1737
msgid "Forgot your password?"
msgstr "Забыли пароль или логин?"
-#: ../../boot.php:1737 ../../Zotlabs/Module/Lostpass.php:91
+#: ../../boot.php:1738 ../../Zotlabs/Module/Lostpass.php:91
msgid "Password Reset"
msgstr "Сбросить пароль"
-#: ../../boot.php:2615
+#: ../../boot.php:2616
#, php-format
msgid "[$Projectname] Website SSL error for %s"
msgstr "[$Projectname] Ошибка SSL/TLS веб-сайта для %s"
-#: ../../boot.php:2620
+#: ../../boot.php:2621
msgid "Website SSL certificate is not valid. Please correct."
msgstr "SSL/TLS сертификат веб-сайт недействителен. Исправьте это."
-#: ../../boot.php:2736
+#: ../../boot.php:2737
#, php-format
msgid "[$Projectname] Cron tasks not running on %s"
msgstr "[$Projectname] Задания Cron не запущены на %s"
-#: ../../boot.php:2741
+#: ../../boot.php:2742
msgid "Cron/Scheduled tasks not running."
msgstr "Задания Cron / планировщика не запущены."
-#: ../../boot.php:2742 ../../include/datetime.php:238
+#: ../../boot.php:2743 ../../include/datetime.php:238
msgid "never"
msgstr "никогда"
#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Block.php:24
-#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Channel.php:217
-#: ../../Zotlabs/Module/Channel.php:373 ../../Zotlabs/Module/Channel.php:412
+#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Channel.php:220
+#: ../../Zotlabs/Module/Channel.php:376 ../../Zotlabs/Module/Channel.php:415
#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Photos.php:71
-#: ../../Zotlabs/Module/Appman.php:91 ../../Zotlabs/Module/Item.php:507
-#: ../../Zotlabs/Module/Item.php:526 ../../Zotlabs/Module/Item.php:536
-#: ../../Zotlabs/Module/Item.php:1451 ../../Zotlabs/Module/Sources.php:80
+#: ../../Zotlabs/Module/Appman.php:153 ../../Zotlabs/Module/Item.php:501
+#: ../../Zotlabs/Module/Item.php:520 ../../Zotlabs/Module/Item.php:530
+#: ../../Zotlabs/Module/Item.php:1444 ../../Zotlabs/Module/Sources.php:80
#: ../../Zotlabs/Module/Poke.php:157 ../../Zotlabs/Module/Card_edit.php:51
-#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637
+#: ../../Zotlabs/Module/Profiles.php:199 ../../Zotlabs/Module/Profiles.php:646
#: ../../Zotlabs/Module/Connections.php:32
-#: ../../Zotlabs/Module/Profile_photo.php:338
-#: ../../Zotlabs/Module/Profile_photo.php:351
+#: ../../Zotlabs/Module/Profile_photo.php:335
+#: ../../Zotlabs/Module/Profile_photo.php:348
#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Editwebpage.php:68
#: ../../Zotlabs/Module/Editwebpage.php:89
#: ../../Zotlabs/Module/Editwebpage.php:107
#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Page.php:34
#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Layouts.php:71
#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Defperms.php:182
+#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Defperms.php:181
#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Article_edit.php:51
#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Filestorage.php:20
#: ../../Zotlabs/Module/Filestorage.php:78
@@ -265,17 +284,17 @@ msgstr "никогда"
#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Locs.php:98
#: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302
#: ../../Zotlabs/Module/Cover_photo.php:341
-#: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Network.php:19
-#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/New_channel.php:105
+#: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Network.php:18
+#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/New_channel.php:105
#: ../../Zotlabs/Module/New_channel.php:130 ../../Zotlabs/Module/Cards.php:84
#: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141
#: ../../Zotlabs/Module/Editlayout.php:67
#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Thing.php:282
#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
#: ../../Zotlabs/Module/Webpages.php:131 ../../Zotlabs/Module/Moderate.php:15
-#: ../../Zotlabs/Module/Group.php:15 ../../Zotlabs/Module/Group.php:31
+#: ../../Zotlabs/Module/Group.php:14 ../../Zotlabs/Module/Group.php:30
#: ../../Zotlabs/Module/Profile.php:99 ../../Zotlabs/Module/Profile.php:114
-#: ../../Zotlabs/Module/Connedit.php:394 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Connedit.php:299 ../../Zotlabs/Module/Editpost.php:17
#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Articles.php:87
#: ../../Zotlabs/Module/Achievements.php:34
#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Setup.php:208
@@ -292,7 +311,7 @@ msgstr "никогда"
#: ../../Zotlabs/Module/Settings.php:58 ../../Zotlabs/Module/Wiki.php:57
#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:425
#: ../../Zotlabs/Lib/Chatroom.php:135 ../../Zotlabs/Web/WebServer.php:116
-#: ../../include/photos.php:30 ../../include/items.php:3749
+#: ../../include/photos.php:30 ../../include/items.php:3881
#: ../../include/attach.php:156 ../../include/attach.php:205
#: ../../include/attach.php:278 ../../include/attach.php:329
#: ../../include/attach.php:424 ../../include/attach.php:438
@@ -310,7 +329,7 @@ msgstr "Доступ запрещен."
#: ../../Zotlabs/Module/Admin/Addons.php:260 ../../Zotlabs/Module/Admin.php:61
#: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Thing.php:96
#: ../../Zotlabs/Module/Display.php:53 ../../Zotlabs/Module/Display.php:428
-#: ../../include/items.php:3672
+#: ../../include/items.php:3804
#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:291
#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:292
msgid "Item not found."
@@ -380,63 +399,73 @@ msgstr "Невозможно найти ваш сервер"
msgid "Post successful."
msgstr "Успешно опубликовано."
-#: ../../Zotlabs/Module/Uexport.php:71 ../../Zotlabs/Module/Uexport.php:72
+#: ../../Zotlabs/Module/Uexport.php:108
+msgid "No content available for year"
+msgstr "Содержимое для года недоступно"
+
+#: ../../Zotlabs/Module/Uexport.php:171
msgid "Export Channel"
msgstr "Экспорт канала"
-#: ../../Zotlabs/Module/Uexport.php:73
+#: ../../Zotlabs/Module/Uexport.php:173
+msgid "Export channel"
+msgstr "Экспортировать канал"
+
+#: ../../Zotlabs/Module/Uexport.php:174
msgid ""
-"Export your basic channel information to a file. This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Экспортировать основную информацию из канала в файл. Служит в качестве резервной копии ваших контактов, основных данных и профиля, однако не включает содержимое. Может быть использовано для импорта ваши данных на новый сервер."
+"This will export your identity and social graph into a file which can be "
+"used to import your channel to a new hub."
+msgstr "Экспортировать ваши данные и социальный граф в файл, который можно использовать для импорта вашего канала на новом хабе."
-#: ../../Zotlabs/Module/Uexport.php:74
-msgid "Export Content"
+#: ../../Zotlabs/Module/Uexport.php:177
+msgid "Export content"
msgstr "Экспортировать содержимое"
-#: ../../Zotlabs/Module/Uexport.php:75
+#: ../../Zotlabs/Module/Uexport.php:178
msgid ""
-"Export your channel information and recent content to a JSON backup that can "
-"be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large. Please be patient - it may take several minutes for "
-"this download to begin."
-msgstr "Экспортировать информацию из вашего канала и его содержимое в резервную копию в формате JSON которая может быть использована для восстановления или импорта на другом сервере. Сохраняет все ваши контакты, разрешения, данные профиля и публикации за несколько месяцев. Файл может иметь очень большой размер. Пожалуйста, будьте терпеливы и подождите несколько минут пока не начнётся загрузка."
+"This will export your posts, direct messages, articles and cards per month "
+"stored into a zip file per year. Months with no posts will be dismissed."
+msgstr "Экспортировать ваши публикации, личные сообщения, статьи и карточки за месяц, хранящиеся в zip-файле за год. Месяцы без сообщений будут отклонены."
-#: ../../Zotlabs/Module/Uexport.php:77
-msgid "Export your posts from a given year."
-msgstr "Экспортировать ваши публикации за данный год."
+#: ../../Zotlabs/Module/Uexport.php:180
+msgid "Export wikis"
+msgstr "Экспортировать wiki"
-#: ../../Zotlabs/Module/Uexport.php:79
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Вы также можете экспортировать ваши публикации и беседы за определённый месяц или год. Выберите дату в панели местоположения в браузере. Если экспорт будет неудачным (это возможно, например, из-за исчерпания памяти на сервере), повторите попытку, выбрав меньший диапазон дат."
+#: ../../Zotlabs/Module/Uexport.php:181
+msgid "This will export your wikis and wiki pages."
+msgstr "Экспортировать ваши wiki и их страницы."
-#: ../../Zotlabs/Module/Uexport.php:80
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
-msgstr "Для выбора всех публикаций заданного года, например текущего, посетите <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Uexport.php:183
+msgid "Export webpages"
+msgstr "Экспортировать веб-страницы"
-#: ../../Zotlabs/Module/Uexport.php:81
-#, php-format
+#: ../../Zotlabs/Module/Uexport.php:184
+msgid "This will export your webpages and menus."
+msgstr "Экспортировать ваши веб-страницы и меню."
+
+#: ../../Zotlabs/Module/Uexport.php:186
+msgid "Export channel calendar"
+msgstr "Экспортировать календарь канала"
+
+#: ../../Zotlabs/Module/Uexport.php:187
msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Для выбора всех публикаций заданного месяца, например за январь сего года, посетите <a href=\"%1$s\">%2$s</a>"
+"This will export your channel calendar events and associated items. CalDAV "
+"calendars are not included."
+msgstr "Экспортировать события календаря вашего канала и связанные элементы, за исключением календарей CalDAV."
+
+#: ../../Zotlabs/Module/Uexport.php:189
+msgid "Export chatrooms"
+msgstr "Экспортировать комнаты чатов"
+
+#: ../../Zotlabs/Module/Uexport.php:190
+msgid "This will export your chatrooms. Chat history is dismissed."
+msgstr "Эксортировать ваши комнаты чатов. История не сохраняется."
-#: ../../Zotlabs/Module/Uexport.php:82
+#: ../../Zotlabs/Module/Uexport.php:192
#, php-format
msgid ""
-"These content files may be imported or restored by visiting <a href=\"%1$s\">"
-"%2$s</a> on any site containing your channel. For best results please import "
-"or restore these in date order (oldest first)."
-msgstr "Данные файлы с содержимым могут быть импортированы и восстановлены на любом содержащем ваш канал сайте. Посетите <a href=\"%1$s\">%2$s</a>. Для лучших результатов пожалуйста производите импорт и восстановление в порядке датировки (старые сначала)."
+"This export can be imported or restored by visiting <a href=\"%1$s\">%2$s</a> on any site containing your channel."
+msgstr "Этот файл можно импортировать или восстановить, посетив <a href=\"%1$s\">% 2 $ s </a> на любом сайте, где есть ваш канал."
#: ../../Zotlabs/Module/Chatsvc.php:131
msgid "Away"
@@ -461,7 +490,7 @@ msgstr "Канал не найден."
#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Module/Page.php:136
#: ../../Zotlabs/Module/Display.php:142 ../../Zotlabs/Module/Display.php:159
#: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Display.php:185
-#: ../../Zotlabs/Lib/NativeWikiPage.php:533 ../../Zotlabs/Web/Router.php:186
+#: ../../Zotlabs/Lib/NativeWikiPage.php:539 ../../Zotlabs/Web/Router.php:186
#: ../../include/help.php:133
msgid "Page not found."
msgstr "Страница не найдена."
@@ -471,37 +500,37 @@ msgstr "Страница не найдена."
msgid "You must be logged in to see this page."
msgstr "Вы должны авторизоваться, чтобы увидеть эту страницу."
-#: ../../Zotlabs/Module/Channel.php:136 ../../Zotlabs/Module/Profile.php:62
+#: ../../Zotlabs/Module/Channel.php:139 ../../Zotlabs/Module/Profile.php:62
#: ../../Zotlabs/Module/Hcard.php:37
msgid "Posts and comments"
msgstr "Публикации и комментарии"
-#: ../../Zotlabs/Module/Channel.php:143 ../../Zotlabs/Module/Profile.php:69
+#: ../../Zotlabs/Module/Channel.php:146 ../../Zotlabs/Module/Profile.php:69
#: ../../Zotlabs/Module/Hcard.php:44
msgid "Only posts"
msgstr "Только публикации"
-#: ../../Zotlabs/Module/Channel.php:156 ../../Zotlabs/Module/Channel.php:178
+#: ../../Zotlabs/Module/Channel.php:159 ../../Zotlabs/Module/Channel.php:181
#: ../../Zotlabs/Module/Pubstream.php:47 ../../Zotlabs/Module/Oep.php:83
#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Hq.php:39
msgid "Malformed message id."
msgstr "Неверный идентификатор сообщения."
-#: ../../Zotlabs/Module/Channel.php:214
+#: ../../Zotlabs/Module/Channel.php:217
msgid "Insufficient permissions. Request redirected to profile page."
msgstr "Недостаточно прав. Запрос перенаправлен на страницу профиля."
-#: ../../Zotlabs/Module/Channel.php:229 ../../Zotlabs/Module/Network.php:168
+#: ../../Zotlabs/Module/Channel.php:232 ../../Zotlabs/Module/Network.php:167
msgid "Search Results For:"
msgstr "Результаты поиска для:"
-#: ../../Zotlabs/Module/Channel.php:264 ../../Zotlabs/Module/Network.php:209
+#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Network.php:208
#: ../../Zotlabs/Module/Pubstream.php:90 ../../Zotlabs/Module/Display.php:87
#: ../../Zotlabs/Module/Hq.php:114
msgid "Reset form"
msgstr "Очистить форму"
-#: ../../Zotlabs/Module/Channel.php:491 ../../Zotlabs/Module/Display.php:358
+#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:358
msgid ""
"You must enable javascript for your browser to be able to view this content."
msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript"
@@ -524,17 +553,17 @@ msgstr "Используйте стрелки для перемещения пр
msgid "Use arrows to move the corresponding app up or down in the app tray"
msgstr "Используйте стрелки для перемещения приложения вверх или вниз в лотке"
-#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:211
+#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:213
msgid "Nickname is required."
msgstr "Требуется псевдоним."
#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46
-#: ../../include/channel.php:225 ../../include/channel.php:657
+#: ../../include/channel.php:227 ../../include/channel.php:659
msgid "Reserved nickname. Please choose another."
msgstr "Зарезервированый псевдоним. Пожалуйста, выберите другой."
#: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51
-#: ../../include/channel.php:230 ../../include/channel.php:662
+#: ../../include/channel.php:232 ../../include/channel.php:664
msgid ""
"Nickname has unsupported characters or is already being used on this site."
msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте."
@@ -631,9 +660,9 @@ msgstr "Мой возраст превышает %s лет и я принима
msgid "Your email address"
msgstr "Ваш адрес электронной почты"
-#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:147
-#: ../../Zotlabs/Module/Appman.php:148 ../../Zotlabs/Module/Profiles.php:747
-#: ../../Zotlabs/Module/Profiles.php:751 ../../include/datetime.php:211
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:209
+#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Profiles.php:791 ../../include/datetime.php:211
#: ../../include/js_strings.php:123
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:334
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:358
@@ -711,11 +740,11 @@ msgstr "Альбом не найден."
msgid "Delete Album"
msgstr "Удалить альбом"
-#: ../../Zotlabs/Module/Photos.php:177 ../../Zotlabs/Module/Photos.php:1063
+#: ../../Zotlabs/Module/Photos.php:177 ../../Zotlabs/Module/Photos.php:1065
msgid "Delete Photo"
msgstr "Удалить фотографию"
-#: ../../Zotlabs/Module/Photos.php:523 ../../Zotlabs/Module/Search.php:21
+#: ../../Zotlabs/Module/Photos.php:523 ../../Zotlabs/Module/Search.php:22
#: ../../Zotlabs/Module/Display.php:28
#: ../../Zotlabs/Module/Viewconnections.php:23
#: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Directory.php:77
@@ -756,10 +785,10 @@ msgstr "или выберите существующий альбом (двой
msgid "Create a status post for this upload"
msgstr "Сделать публикацию о статусе для этой загрузки"
-#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1048
+#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1050
#: ../../Zotlabs/Module/Card_edit.php:118
#: ../../Zotlabs/Module/Article_edit.php:116
-#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1481
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1495
#: ../../extend/addon/hzaddons/hsse/hsse.php:221
msgid "Title (optional)"
msgstr "Заголовок (необязательно)"
@@ -768,16 +797,16 @@ msgstr "Заголовок (необязательно)"
msgid "Description (optional)"
msgstr "Описание (необязательно)"
-#: ../../Zotlabs/Module/Photos.php:682 ../../Zotlabs/Module/Photos.php:1051
+#: ../../Zotlabs/Module/Photos.php:682 ../../Zotlabs/Module/Photos.php:1053
#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Chat.php:239
#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
-#: ../../Zotlabs/Module/Connedit.php:675 ../../include/acl_selectors.php:154
+#: ../../include/acl_selectors.php:154
#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:261
msgid "Permissions"
msgstr "Разрешения"
#: ../../Zotlabs/Module/Photos.php:692
-#: ../../Zotlabs/Module/Profile_photo.php:500
+#: ../../Zotlabs/Module/Profile_photo.php:497
#: ../../Zotlabs/Module/Embedphotos.php:189
#: ../../Zotlabs/Module/Cover_photo.php:423
#: ../../Zotlabs/Storage/Browser.php:540 ../../Zotlabs/Widget/Cdav.php:146
@@ -786,119 +815,119 @@ msgstr "Разрешения"
msgid "Upload"
msgstr "Загрузка"
-#: ../../Zotlabs/Module/Photos.php:765
+#: ../../Zotlabs/Module/Photos.php:767
msgid "Show Newest First"
msgstr "Показать новые первыми"
-#: ../../Zotlabs/Module/Photos.php:767
+#: ../../Zotlabs/Module/Photos.php:769
msgid "Show Oldest First"
msgstr "Показать старые первыми"
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1335
+#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1337
#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Widget/Album.php:78
#: ../../Zotlabs/Widget/Portfolio.php:87
msgid "View Photo"
msgstr "Посмотреть фотографию"
-#: ../../Zotlabs/Module/Photos.php:797 ../../Zotlabs/Module/Photos.php:1257
-#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Activity.php:1605
-#: ../../Zotlabs/Lib/Apps.php:1164 ../../Zotlabs/Lib/Apps.php:1248
+#: ../../Zotlabs/Module/Photos.php:799 ../../Zotlabs/Module/Photos.php:1259
+#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Activity.php:1656
+#: ../../Zotlabs/Lib/Apps.php:1148 ../../Zotlabs/Lib/Apps.php:1232
#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:95
#: ../../Zotlabs/Widget/Pinned.php:268 ../../include/cdav.php:158
#: ../../include/cdav.php:159 ../../include/cdav.php:167
-#: ../../include/conversation.php:1217
+#: ../../include/conversation.php:1231
msgid "Unknown"
msgstr "Неизвестный"
-#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Embedphotos.php:187
+#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Embedphotos.php:187
#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108
msgid "Edit Album"
msgstr "Редактировать Фотоальбом"
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366
+#: ../../Zotlabs/Module/Photos.php:826 ../../Zotlabs/Module/Photos.php:1368
msgid "Add Photos"
msgstr "Добавить фотографии"
-#: ../../Zotlabs/Module/Photos.php:872
+#: ../../Zotlabs/Module/Photos.php:874
msgid "Permission denied. Access to this item may be restricted."
msgstr "Доступ запрещен. Доступ к этому элементу может быть ограничен."
-#: ../../Zotlabs/Module/Photos.php:874
+#: ../../Zotlabs/Module/Photos.php:876
msgid "Photo not available"
msgstr "Фотография не доступна"
-#: ../../Zotlabs/Module/Photos.php:932
+#: ../../Zotlabs/Module/Photos.php:934
msgid "Use as profile photo"
msgstr "Использовать в качестве фотографии профиля"
-#: ../../Zotlabs/Module/Photos.php:933
+#: ../../Zotlabs/Module/Photos.php:935
msgid "Use as cover photo"
msgstr "Использовать в качестве фотографии обложки"
-#: ../../Zotlabs/Module/Photos.php:940
+#: ../../Zotlabs/Module/Photos.php:942
msgid "Private Photo"
msgstr "Личная фотография"
-#: ../../Zotlabs/Module/Photos.php:951 ../../Zotlabs/Module/Cdav.php:1034
+#: ../../Zotlabs/Module/Photos.php:953 ../../Zotlabs/Module/Cdav.php:1034
#: ../../Zotlabs/Module/Cal.php:203
msgid "Previous"
msgstr "Предыдущая"
-#: ../../Zotlabs/Module/Photos.php:955
+#: ../../Zotlabs/Module/Photos.php:957
msgid "View Full Size"
msgstr "Посмотреть в полный размер"
-#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Cdav.php:1035
+#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Cdav.php:1035
#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Setup.php:262
msgid "Next"
msgstr "Следующая"
-#: ../../Zotlabs/Module/Photos.php:1000
+#: ../../Zotlabs/Module/Photos.php:1002
#: ../../Zotlabs/Module/Admin/Addons.php:459 ../../Zotlabs/Module/Tagrm.php:137
-#: ../../Zotlabs/Module/Profile_photo.php:501
+#: ../../Zotlabs/Module/Profile_photo.php:498
#: ../../Zotlabs/Module/Cover_photo.php:424
#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:90
msgid "Remove"
msgstr "Удалить"
-#: ../../Zotlabs/Module/Photos.php:1037
+#: ../../Zotlabs/Module/Photos.php:1039
msgid "Edit photo"
msgstr "Редактировать фотографию"
-#: ../../Zotlabs/Module/Photos.php:1039
+#: ../../Zotlabs/Module/Photos.php:1041
msgid "Rotate CW (right)"
msgstr "Повернуть CW (направо)"
-#: ../../Zotlabs/Module/Photos.php:1040
+#: ../../Zotlabs/Module/Photos.php:1042
msgid "Rotate CCW (left)"
msgstr "Повернуть CCW (налево)"
-#: ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Photos.php:1045
msgid "Move photo to album"
msgstr "Переместить фотографию в альбом"
-#: ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Photos.php:1046
msgid "Enter a new album name"
msgstr "Введите новое название альбома"
-#: ../../Zotlabs/Module/Photos.php:1045
+#: ../../Zotlabs/Module/Photos.php:1047
msgid "or select an existing one (doubleclick)"
msgstr "или выбрать существующую (двойной щелчок)"
-#: ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1052
msgid "Add a Tag"
msgstr "Добавить тег"
-#: ../../Zotlabs/Module/Photos.php:1058
+#: ../../Zotlabs/Module/Photos.php:1060
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com"
-#: ../../Zotlabs/Module/Photos.php:1061
+#: ../../Zotlabs/Module/Photos.php:1063
msgid "Flag as adult in album view"
msgstr "Пометить как альбом \"для взрослых\""
-#: ../../Zotlabs/Module/Photos.php:1062 ../../Zotlabs/Module/Photos.php:1102
-#: ../../Zotlabs/Module/Photos.php:1218 ../../Zotlabs/Module/Appman.php:159
+#: ../../Zotlabs/Module/Photos.php:1064 ../../Zotlabs/Module/Photos.php:1104
+#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Appman.php:221
#: ../../Zotlabs/Module/Admin/Account_edit.php:73
#: ../../Zotlabs/Module/Admin/Accounts.php:309
#: ../../Zotlabs/Module/Admin/Themes.php:158
@@ -910,13 +939,14 @@ msgstr "Пометить как альбом \"для взрослых\""
#: ../../Zotlabs/Module/Admin/Security.php:120
#: ../../Zotlabs/Module/Admin/Logs.php:84 ../../Zotlabs/Module/Sources.php:123
#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Module/Poke.php:215
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Oauth.php:109
+#: ../../Zotlabs/Module/Profiles.php:765 ../../Zotlabs/Module/Oauth.php:109
#: ../../Zotlabs/Module/Connect.php:107
-#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Regate.php:387 ../../Zotlabs/Module/Defperms.php:264
+#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Zotlabs/Module/Regate.php:407 ../../Zotlabs/Module/Defperms.php:263
#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Filestorage.php:208
-#: ../../Zotlabs/Module/Permcats.php:127 ../../Zotlabs/Module/Pdledit.php:106
+#: ../../Zotlabs/Module/Permcats.php:242 ../../Zotlabs/Module/Pdledit.php:106
#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Chat.php:246
+#: ../../Zotlabs/Module/Settings/Privacy.php:110
#: ../../Zotlabs/Module/Settings/Directory.php:42
#: ../../Zotlabs/Module/Settings/Account.php:107
#: ../../Zotlabs/Module/Settings/Calendar.php:42
@@ -930,19 +960,21 @@ msgstr "Пометить как альбом \"для взрослых\""
#: ../../Zotlabs/Module/Settings/Events.php:42
#: ../../Zotlabs/Module/Settings/Channel_home.php:91
#: ../../Zotlabs/Module/Settings/Profiles.php:52
-#: ../../Zotlabs/Module/Settings/Channel.php:499
+#: ../../Zotlabs/Module/Settings/Channel.php:224
#: ../../Zotlabs/Module/Settings/Connections.php:42
-#: ../../Zotlabs/Module/Locs.php:125 ../../Zotlabs/Module/Invite.php:549
-#: ../../Zotlabs/Module/Affinity.php:84 ../../Zotlabs/Module/Pconfig.php:116
-#: ../../Zotlabs/Module/Thing.php:328 ../../Zotlabs/Module/Thing.php:381
+#: ../../Zotlabs/Module/Contactedit.php:429
+#: ../../Zotlabs/Module/Contactedit.php:455 ../../Zotlabs/Module/Locs.php:125
+#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Affinity.php:84
+#: ../../Zotlabs/Module/Pconfig.php:116 ../../Zotlabs/Module/Thing.php:328
+#: ../../Zotlabs/Module/Thing.php:381
#: ../../Zotlabs/Module/Email_validation.php:40
-#: ../../Zotlabs/Module/Import.php:602 ../../Zotlabs/Module/Group.php:149
-#: ../../Zotlabs/Module/Group.php:165 ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Import.php:611 ../../Zotlabs/Module/Group.php:166
+#: ../../Zotlabs/Module/Group.php:185 ../../Zotlabs/Module/Connedit.php:714
#: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Setup.php:306
#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Mitem.php:259
#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Oauth2.php:114
-#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Tokens.php:186
-#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Lib/ThreadItem.php:827
+#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Tokens.php:293
+#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Lib/ThreadItem.php:850
#: ../../Zotlabs/Widget/Eventstools.php:16
#: ../../Zotlabs/Widget/Wiki_pages.php:42
#: ../../Zotlabs/Widget/Wiki_pages.php:99 ../../include/js_strings.php:22
@@ -957,7 +989,7 @@ msgstr "Пометить как альбом \"для взрослых\""
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:248
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:312
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:412
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:644
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:645
#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:410
#: ../../extend/addon/hzaddons/cart/cart.php:1376
#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:107
@@ -1004,97 +1036,97 @@ msgstr "Пометить как альбом \"для взрослых\""
msgid "Submit"
msgstr "Отправить"
-#: ../../Zotlabs/Module/Photos.php:1080 ../../Zotlabs/Lib/ThreadItem.php:318
+#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:341
msgid "I like this (toggle)"
msgstr "мне это нравится (переключение)"
-#: ../../Zotlabs/Module/Photos.php:1081 ../../Zotlabs/Lib/ThreadItem.php:319
+#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:342
msgid "I don't like this (toggle)"
msgstr "мне это не нравится (переключение)"
-#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Photos.php:1084 ../../Zotlabs/Module/Layouts.php:194
#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:253
#: ../../Zotlabs/Module/Wiki.php:298 ../../Zotlabs/Widget/Cdav.php:136
-#: ../../include/conversation.php:1441
+#: ../../include/conversation.php:1455
#: ../../extend/addon/hzaddons/hsse/hsse.php:186
msgid "Share"
msgstr "Поделиться"
-#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:503
+#: ../../Zotlabs/Module/Photos.php:1085 ../../Zotlabs/Lib/ThreadItem.php:526
#: ../../include/conversation.php:838
msgid "Please wait"
msgstr "Подождите пожалуйста"
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Photos.php:1215
-#: ../../Zotlabs/Lib/ThreadItem.php:824
+#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:847
msgid "This is you"
msgstr "Это вы"
-#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217
-#: ../../Zotlabs/Lib/ThreadItem.php:826 ../../include/js_strings.php:6
+#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Module/Photos.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:849 ../../include/js_strings.php:6
msgid "Comment"
msgstr "Комментарий"
-#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Module/Webpages.php:259
-#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1408
+#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Module/Webpages.php:259
+#: ../../Zotlabs/Lib/ThreadItem.php:860 ../../include/conversation.php:1422
#: ../../extend/addon/hzaddons/hsse/hsse.php:153
msgid "Preview"
msgstr "Предварительный просмотр"
-#: ../../Zotlabs/Module/Photos.php:1117 ../../include/conversation.php:652
+#: ../../Zotlabs/Module/Photos.php:1119 ../../include/conversation.php:652
msgctxt "title"
msgid "Likes"
msgstr "Нравится"
-#: ../../Zotlabs/Module/Photos.php:1117 ../../include/conversation.php:653
+#: ../../Zotlabs/Module/Photos.php:1119 ../../include/conversation.php:653
msgctxt "title"
msgid "Dislikes"
msgstr "Не нравится"
-#: ../../Zotlabs/Module/Photos.php:1118 ../../Zotlabs/Widget/Pinned.php:77
+#: ../../Zotlabs/Module/Photos.php:1120 ../../Zotlabs/Widget/Pinned.php:77
#: ../../include/conversation.php:654
msgctxt "title"
msgid "Agree"
msgstr "Согласен"
-#: ../../Zotlabs/Module/Photos.php:1118 ../../Zotlabs/Widget/Pinned.php:78
+#: ../../Zotlabs/Module/Photos.php:1120 ../../Zotlabs/Widget/Pinned.php:78
#: ../../include/conversation.php:655
msgctxt "title"
msgid "Disagree"
msgstr "Не согласен"
-#: ../../Zotlabs/Module/Photos.php:1118 ../../Zotlabs/Widget/Pinned.php:79
+#: ../../Zotlabs/Module/Photos.php:1120 ../../Zotlabs/Widget/Pinned.php:79
#: ../../include/conversation.php:656
msgctxt "title"
msgid "Abstain"
msgstr "Воздержался"
-#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Widget/Pinned.php:66
+#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Widget/Pinned.php:66
#: ../../include/conversation.php:657
msgctxt "title"
msgid "Attending"
msgstr "Посещаю"
-#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Widget/Pinned.php:67
+#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Widget/Pinned.php:67
#: ../../include/conversation.php:658
msgctxt "title"
msgid "Not attending"
msgstr "Не посещаю"
-#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Widget/Pinned.php:68
+#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Widget/Pinned.php:68
#: ../../include/conversation.php:659
msgctxt "title"
msgid "Might attend"
msgstr "Возможно посещу"
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Module/Photos.php:1148
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../Zotlabs/Lib/ThreadItem.php:251
+#: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1150
+#: ../../Zotlabs/Lib/ThreadItem.php:262 ../../Zotlabs/Lib/ThreadItem.php:274
msgid "View all"
msgstr "Просмотреть все"
-#: ../../Zotlabs/Module/Photos.php:1140 ../../Zotlabs/Lib/ThreadItem.php:243
-#: ../../include/channel.php:1739 ../../include/taxonomy.php:670
-#: ../../include/conversation.php:1754
+#: ../../Zotlabs/Module/Photos.php:1142 ../../Zotlabs/Lib/ThreadItem.php:266
+#: ../../include/channel.php:1774 ../../include/taxonomy.php:670
+#: ../../include/conversation.php:1768
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
@@ -1102,8 +1134,8 @@ msgstr[0] "Нравится"
msgstr[1] "Нравится"
msgstr[2] "Нравится"
-#: ../../Zotlabs/Module/Photos.php:1145 ../../Zotlabs/Lib/ThreadItem.php:248
-#: ../../include/conversation.php:1757
+#: ../../Zotlabs/Module/Photos.php:1147 ../../Zotlabs/Lib/ThreadItem.php:271
+#: ../../include/conversation.php:1771
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
@@ -1111,56 +1143,57 @@ msgstr[0] "Не нравится"
msgstr[1] "Не нравится"
msgstr[2] "Не нравится"
-#: ../../Zotlabs/Module/Photos.php:1183
+#: ../../Zotlabs/Module/Photos.php:1185
#: ../../Zotlabs/Module/Admin/Accounts.php:320
#: ../../Zotlabs/Module/Admin/Profs.php:176
#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Module/Connections.php:329 ../../Zotlabs/Module/Cdav.php:1055
+#: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Profiles.php:842
+#: ../../Zotlabs/Module/Connections.php:337 ../../Zotlabs/Module/Cdav.php:1055
#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Oauth.php:172
#: ../../Zotlabs/Module/Editwebpage.php:167
#: ../../Zotlabs/Module/Article_edit.php:128
-#: ../../Zotlabs/Module/Editblock.php:139 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Permcats.php:246 ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Contactedit.php:660
#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Thing.php:269
-#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Connedit.php:653
-#: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Oauth2.php:193
-#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/ThreadItem.php:171
+#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Connedit.php:540
+#: ../../Zotlabs/Module/Connedit.php:749 ../../Zotlabs/Module/Oauth2.php:193
+#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/ThreadItem.php:194
#: ../../Zotlabs/Lib/Apps.php:598 ../../include/conversation.php:730
#: ../../include/conversation.php:784
msgid "Delete"
msgstr "Удалить"
-#: ../../Zotlabs/Module/Photos.php:1249
+#: ../../Zotlabs/Module/Photos.php:1251
msgid "Photo Tools"
msgstr "Фото-Инструменты"
-#: ../../Zotlabs/Module/Photos.php:1258
+#: ../../Zotlabs/Module/Photos.php:1260
msgid "In This Photo:"
msgstr "На этой фотографии:"
-#: ../../Zotlabs/Module/Photos.php:1263
+#: ../../Zotlabs/Module/Photos.php:1265
msgid "Map"
msgstr "Карта"
-#: ../../Zotlabs/Module/Photos.php:1271 ../../Zotlabs/Lib/ThreadItem.php:491
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:514
msgctxt "noun"
msgid "Likes"
msgstr "Нравится"
-#: ../../Zotlabs/Module/Photos.php:1272 ../../Zotlabs/Lib/ThreadItem.php:492
+#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:515
msgctxt "noun"
msgid "Dislikes"
msgstr "Не нравится"
-#: ../../Zotlabs/Module/Photos.php:1277 ../../Zotlabs/Storage/Browser.php:411
-#: ../../Zotlabs/Lib/ThreadItem.php:497 ../../Zotlabs/Widget/Pinned.php:158
+#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Storage/Browser.php:411
+#: ../../Zotlabs/Lib/ThreadItem.php:520 ../../Zotlabs/Widget/Pinned.php:158
#: ../../include/acl_selectors.php:156
#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:233
msgid "Close"
msgstr "Закрыть"
-#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363
-#: ../../Zotlabs/Module/Photos.php:1364 ../../include/photos.php:715
+#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1366 ../../include/photos.php:723
msgid "Recent Photos"
msgstr "Последние фотографии"
@@ -1172,55 +1205,55 @@ msgstr "Приложение установлено."
msgid "Malformed app."
msgstr "Неработающее приложение."
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Zotlabs/Module/Appman.php:198
msgid "Embed code"
msgstr "Встроить код"
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Zotlabs/Module/Appman.php:204
msgid "Edit App"
msgstr "Редактировать приложение"
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Zotlabs/Module/Appman.php:204
msgid "Create App"
msgstr "Создать приложение"
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Zotlabs/Module/Appman.php:209
msgid "Name of app"
msgstr "Наименование приложения"
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Zotlabs/Module/Appman.php:210
msgid "Location (URL) of app"
msgstr "Местоположение (URL) приложения"
-#: ../../Zotlabs/Module/Appman.php:149 ../../Zotlabs/Module/Cdav.php:1013
+#: ../../Zotlabs/Module/Appman.php:211 ../../Zotlabs/Module/Cdav.php:1013
#: ../../Zotlabs/Module/Rbmark.php:100
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:260
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:656
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:657
#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:173
msgid "Description"
msgstr "Описание"
-#: ../../Zotlabs/Module/Appman.php:150
+#: ../../Zotlabs/Module/Appman.php:212
msgid "Photo icon URL"
msgstr "URL пиктограммы"
-#: ../../Zotlabs/Module/Appman.php:150
+#: ../../Zotlabs/Module/Appman.php:212
msgid "80 x 80 pixels - optional"
msgstr "80 x 80 пикселей - необязательно"
-#: ../../Zotlabs/Module/Appman.php:151
+#: ../../Zotlabs/Module/Appman.php:213
msgid "Categories (optional, comma separated list)"
msgstr "Категории (необязательно, список через запятую)"
-#: ../../Zotlabs/Module/Appman.php:152
+#: ../../Zotlabs/Module/Appman.php:214
msgid "Version ID"
msgstr "ID версии"
-#: ../../Zotlabs/Module/Appman.php:153
+#: ../../Zotlabs/Module/Appman.php:215
msgid "Price of app"
msgstr "Цена приложения"
-#: ../../Zotlabs/Module/Appman.php:154
+#: ../../Zotlabs/Module/Appman.php:216
msgid "Location (URL) to purchase app"
msgstr "Ссылка (URL) для покупки приложения"
@@ -1342,7 +1375,7 @@ msgstr[2] "%s аккаунтов удалено"
msgid "Account not found"
msgstr "Аккаунт не найден"
-#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2721
+#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2770
#, php-format
msgid "Account '%s' deleted"
msgstr "Аккаунт '%s' удален"
@@ -1417,8 +1450,8 @@ msgstr "Дата запроса"
#: ../../Zotlabs/Module/Admin/Accounts.php:316
#: ../../Zotlabs/Module/Admin/Accounts.php:330
-#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Cdav.php:1376
-#: ../../Zotlabs/Module/Connedit.php:912 ../../include/network.php:1743
+#: ../../Zotlabs/Module/Profiles.php:829 ../../Zotlabs/Module/Cdav.php:1376
+#: ../../Zotlabs/Module/Connedit.php:736 ../../include/network.php:1743
#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:69
#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:55
#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:56
@@ -1439,7 +1472,7 @@ msgid "No verified registrations available"
msgstr "Нет доступных подтвержденных регистраций "
#: ../../Zotlabs/Module/Admin/Accounts.php:318
-#: ../../Zotlabs/Module/Connections.php:343 ../../include/conversation.php:783
+#: ../../Zotlabs/Module/Connections.php:351 ../../include/conversation.php:783
msgid "Approve"
msgstr "Утвердить"
@@ -1449,12 +1482,14 @@ msgid "Deny"
msgstr "Запретить"
#: ../../Zotlabs/Module/Admin/Accounts.php:321
-#: ../../Zotlabs/Module/Connedit.php:621
+#: ../../Zotlabs/Module/Contactedit.php:632
+#: ../../Zotlabs/Module/Connedit.php:508
msgid "Block"
msgstr "Блокировать"
#: ../../Zotlabs/Module/Admin/Accounts.php:322
-#: ../../Zotlabs/Module/Connedit.php:621
+#: ../../Zotlabs/Module/Contactedit.php:632
+#: ../../Zotlabs/Module/Connedit.php:508
msgid "Unblock"
msgstr "Разблокировать"
@@ -1499,7 +1534,7 @@ msgid ""
msgstr "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"
#: ../../Zotlabs/Module/Admin/Accounts.php:347
-#: ../../include/conversation.php:1126
+#: ../../include/conversation.php:1134
msgid "Message"
msgstr "Сообщение"
@@ -1566,7 +1601,7 @@ msgstr "Переключить"
#: ../../Zotlabs/Module/Admin/Themes.php:125
#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:345
#: ../../Zotlabs/Widget/Newmember.php:53
-#: ../../Zotlabs/Widget/Settings_menu.php:61 ../../include/nav.php:103
+#: ../../Zotlabs/Widget/Settings_menu.php:66 ../../include/nav.php:101
msgid "Settings"
msgstr "Настройки"
@@ -1631,8 +1666,7 @@ msgstr "Дополнительная информация (необязател
#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54
#: ../../Zotlabs/Module/Cards.php:111 ../../Zotlabs/Module/Rbmark.php:31
#: ../../Zotlabs/Module/Rbmark.php:103 ../../Zotlabs/Module/Articles.php:115
-#: ../../Zotlabs/Widget/Notes.php:23 ../../include/text.php:1146
-#: ../../include/text.php:1158
+#: ../../include/text.php:1143 ../../include/text.php:1155
#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:116
msgid "Save"
msgstr "Запомнить"
@@ -1671,20 +1705,20 @@ msgstr "Настраиваемые поля"
#: ../../Zotlabs/Module/Admin/Profs.php:175
#: ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Module/Connections.php:321
-#: ../../Zotlabs/Module/Connections.php:363
-#: ../../Zotlabs/Module/Connections.php:383 ../../Zotlabs/Module/Oauth.php:171
+#: ../../Zotlabs/Module/Connections.php:329
+#: ../../Zotlabs/Module/Connections.php:379
+#: ../../Zotlabs/Module/Connections.php:400 ../../Zotlabs/Module/Oauth.php:171
#: ../../Zotlabs/Module/Editwebpage.php:142
#: ../../Zotlabs/Module/Layouts.php:193
#: ../../Zotlabs/Module/Article_edit.php:97
#: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Blocks.php:160
#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Module/Editlayout.php:114
#: ../../Zotlabs/Module/Thing.php:268 ../../Zotlabs/Module/Webpages.php:252
-#: ../../Zotlabs/Module/Group.php:251 ../../Zotlabs/Module/Oauth2.php:192
+#: ../../Zotlabs/Module/Group.php:271 ../../Zotlabs/Module/Oauth2.php:192
#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:381
-#: ../../Zotlabs/Lib/ThreadItem.php:149 ../../Zotlabs/Lib/Apps.php:597
+#: ../../Zotlabs/Lib/ThreadItem.php:172 ../../Zotlabs/Lib/Apps.php:597
#: ../../Zotlabs/Widget/Cdav.php:138 ../../Zotlabs/Widget/Cdav.php:175
-#: ../../include/channel.php:1496 ../../include/channel.php:1500
+#: ../../include/channel.php:1530 ../../include/channel.php:1534
#: ../../include/menu.php:120
msgid "Edit"
msgstr "Изменить"
@@ -1783,9 +1817,9 @@ msgid "Install"
msgstr "Установить"
#: ../../Zotlabs/Module/Admin/Addons.php:427
-#: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Profiles.php:843
#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../Zotlabs/Module/Profile_photo.php:507
+#: ../../Zotlabs/Module/Profile_photo.php:504
#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
#: ../../Zotlabs/Module/Editwebpage.php:169
@@ -1793,12 +1827,12 @@ msgstr "Установить"
#: ../../Zotlabs/Module/Editblock.php:141
#: ../../Zotlabs/Module/Cover_photo.php:428 ../../Zotlabs/Module/Filer.php:56
#: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Connedit.php:926 ../../Zotlabs/Module/Editpost.php:111
+#: ../../Zotlabs/Module/Connedit.php:750 ../../Zotlabs/Module/Editpost.php:111
#: ../../Zotlabs/Module/Oauth2.php:115 ../../Zotlabs/Module/Oauth2.php:143
#: ../../Zotlabs/Module/Wiki.php:365 ../../Zotlabs/Module/Wiki.php:398
#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1464
-#: ../../include/conversation.php:1519
+#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1478
+#: ../../include/conversation.php:1533
#: ../../extend/addon/hzaddons/hsse/hsse.php:209
#: ../../extend/addon/hzaddons/hsse/hsse.php:258
msgid "Cancel"
@@ -1817,9 +1851,9 @@ msgid "Install a New Addon Repository"
msgstr "Установить новый репозиторий расширений"
#: ../../Zotlabs/Module/Admin/Addons.php:457
-#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Cdav.php:1052
+#: ../../Zotlabs/Module/Profiles.php:841 ../../Zotlabs/Module/Cdav.php:1052
#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Oauth.php:53
-#: ../../Zotlabs/Module/Oauth.php:135 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Oauth.php:135 ../../Zotlabs/Module/Connedit.php:748
#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:142
#: ../../Zotlabs/Lib/Apps.php:542
msgid "Update"
@@ -1841,7 +1875,7 @@ msgstr "Ошибки"
msgid "Site settings updated."
msgstr "Настройки сайта обновлены."
-#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3374
+#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3402
#: ../../view/theme/redbasic/php/config.php:15
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:335
#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:359
@@ -2083,7 +2117,7 @@ msgid "Advanced examples:"
msgstr "Дополнительные примеры:"
#: ../../Zotlabs/Module/Admin/Site.php:457
-#: ../../Zotlabs/Module/Settings/Channel.php:422
+#: ../../Zotlabs/Module/Settings/Channel.php:178
msgid "or"
msgstr "или"
@@ -2218,7 +2252,9 @@ msgstr "Импортировать только публичные потоки
#: ../../Zotlabs/Module/Admin/Site.php:512
#: ../../Zotlabs/Module/Admin/Site.php:513
-#: ../../Zotlabs/Module/Connedit.php:877 ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Contactedit.php:423
+#: ../../Zotlabs/Module/Contactedit.php:424
+#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Module/Connedit.php:707
msgid ""
"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
"all posts"
@@ -2480,7 +2516,7 @@ msgstr "Разрешить код"
msgid "Disallow Code"
msgstr "Запретить код"
-#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:426
+#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:424
msgid "Channel"
msgstr "Канал"
@@ -2491,20 +2527,20 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Channels.php:159
#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Oauth.php:111
#: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Chat.php:255
-#: ../../Zotlabs/Module/Group.php:153 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Zotlabs/Module/Group.php:172 ../../Zotlabs/Module/Connedit.php:732
#: ../../Zotlabs/Module/Sharedwithme.php:106
#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144
#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Storage/Browser.php:377
-#: ../../Zotlabs/Lib/NativeWikiPage.php:576
+#: ../../Zotlabs/Lib/NativeWikiPage.php:582
#: ../../Zotlabs/Widget/Wiki_page_history.php:22
#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172
msgid "Name"
msgstr "Имя"
#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792
+#: ../../Zotlabs/Module/Profiles.php:501 ../../Zotlabs/Module/Profiles.php:832
#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Locs.php:122
-#: ../../Zotlabs/Module/Connedit.php:915
+#: ../../Zotlabs/Module/Connedit.php:739
msgid "Address"
msgstr "Адрес"
@@ -2687,36 +2723,36 @@ msgstr "Должен быть доступен для записи веб-сер
msgid "Log level"
msgstr "Уровень журнала"
-#: ../../Zotlabs/Module/Item.php:472 ../../Zotlabs/Module/Pin.php:36
+#: ../../Zotlabs/Module/Item.php:466 ../../Zotlabs/Module/Pin.php:36
msgid "Unable to locate original post."
msgstr "Не удалось найти оригинальную публикацию."
-#: ../../Zotlabs/Module/Item.php:758
+#: ../../Zotlabs/Module/Item.php:748
msgid "Empty post discarded."
msgstr "Пустая публикация отклонена."
-#: ../../Zotlabs/Module/Item.php:1192
+#: ../../Zotlabs/Module/Item.php:1187
msgid "Duplicate post suppressed."
msgstr "Подавлена дублирующаяся публикация."
-#: ../../Zotlabs/Module/Item.php:1337
+#: ../../Zotlabs/Module/Item.php:1330
msgid "System error. Post not saved."
msgstr "Системная ошибка. Публикация не сохранена."
-#: ../../Zotlabs/Module/Item.php:1371
+#: ../../Zotlabs/Module/Item.php:1364
msgid "Your comment is awaiting approval."
msgstr "Ваш комментарий ожидает одобрения."
-#: ../../Zotlabs/Module/Item.php:1505
+#: ../../Zotlabs/Module/Item.php:1497
msgid "Unable to obtain post information from database."
msgstr "Невозможно получить информацию о публикации из базы данных"
-#: ../../Zotlabs/Module/Item.php:1512
+#: ../../Zotlabs/Module/Item.php:1504
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня."
-#: ../../Zotlabs/Module/Item.php:1519
+#: ../../Zotlabs/Module/Item.php:1511
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Вы достигли вашего ограничения в %1$.0f страниц."
@@ -2812,9 +2848,9 @@ msgid "network"
msgstr "сеть"
#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:89
-#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Share.php:72
+#: ../../Zotlabs/Module/Import_items.php:116 ../../Zotlabs/Module/Share.php:72
#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:55
-#: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Group.php:95
+#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Group.php:108
#: ../../Zotlabs/Module/Cloud.php:123 ../../Zotlabs/Web/WebServer.php:115
#: ../../include/items.php:440
#: ../../extend/addon/hzaddons/redphotos/redphotos.php:119
@@ -2832,7 +2868,7 @@ msgid "Profile Visibility Editor"
msgstr "Редактор видимости профиля"
#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:368
-#: ../../include/channel.php:1844
+#: ../../include/channel.php:1879
msgid "Profile"
msgstr "Профиль"
@@ -2850,7 +2886,7 @@ msgid "All Connections"
msgstr "Все контакты"
#: ../../Zotlabs/Module/Poke.php:197 ../../Zotlabs/Lib/Apps.php:357
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1158
msgid "Poke"
msgstr "Ткнуть"
@@ -2891,7 +2927,7 @@ msgstr "Элемент не найден"
#: ../../Zotlabs/Module/Editwebpage.php:143
#: ../../Zotlabs/Module/Article_edit.php:99
#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:218
-#: ../../include/conversation.php:1348
+#: ../../include/conversation.php:1362
#: ../../extend/addon/hzaddons/hsse/hsse.php:95
#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:205
msgid "Insert web link"
@@ -2902,7 +2938,7 @@ msgid "Edit Card"
msgstr "Редактировать карточку"
#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
-#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661
+#: ../../Zotlabs/Module/Profiles.php:242 ../../Zotlabs/Module/Profiles.php:671
msgid "Profile not found."
msgstr "Профиль не найден."
@@ -2926,344 +2962,356 @@ msgstr "Профиль недоступен для клонирования."
msgid "Profile unavailable to export."
msgstr "Профиль недоступен для экспорта."
-#: ../../Zotlabs/Module/Profiles.php:254
+#: ../../Zotlabs/Module/Profiles.php:253
msgid "Profile Name is required."
msgstr "Требуется имя профиля."
-#: ../../Zotlabs/Module/Profiles.php:461
+#: ../../Zotlabs/Module/Profiles.php:458
msgid "Marital Status"
msgstr "Семейное положение"
-#: ../../Zotlabs/Module/Profiles.php:465
+#: ../../Zotlabs/Module/Profiles.php:462
msgid "Romantic Partner"
msgstr "Романтический партнер"
-#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:466 ../../Zotlabs/Module/Profiles.php:814
msgid "Likes"
msgstr "Нравится"
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Profiles.php:815
msgid "Dislikes"
msgstr "Не нравится"
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782
+#: ../../Zotlabs/Module/Profiles.php:474 ../../Zotlabs/Module/Profiles.php:822
msgid "Work/Employment"
msgstr "Работа / Занятость"
-#: ../../Zotlabs/Module/Profiles.php:480
+#: ../../Zotlabs/Module/Profiles.php:477
msgid "Religion"
msgstr "Религия"
-#: ../../Zotlabs/Module/Profiles.php:484
+#: ../../Zotlabs/Module/Profiles.php:481
msgid "Political Views"
msgstr "Политические взгляды"
-#: ../../Zotlabs/Module/Profiles.php:488
+#: ../../Zotlabs/Module/Profiles.php:485
#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:74
msgid "Gender"
msgstr "Гендер"
-#: ../../Zotlabs/Module/Profiles.php:492
+#: ../../Zotlabs/Module/Profiles.php:489
msgid "Sexual Preference"
msgstr "Сексуальная ориентация"
-#: ../../Zotlabs/Module/Profiles.php:496
+#: ../../Zotlabs/Module/Profiles.php:493
msgid "Homepage"
msgstr "Домашняя страница"
-#: ../../Zotlabs/Module/Profiles.php:500
+#: ../../Zotlabs/Module/Profiles.php:497
msgid "Interests"
msgstr "Интересы"
-#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736
+#: ../../Zotlabs/Module/Profiles.php:508 ../../Zotlabs/Module/Profiles.php:776
#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Locs.php:121
#: ../../Zotlabs/Module/Pubsites.php:52 ../../include/js_strings.php:25
msgid "Location"
msgstr "Место"
-#: ../../Zotlabs/Module/Profiles.php:596
+#: ../../Zotlabs/Module/Profiles.php:605
msgid "Profile updated."
msgstr "Профиль обновлен."
-#: ../../Zotlabs/Module/Profiles.php:680
-msgid "Hide your connections list from viewers of this profile"
-msgstr "Скрывать от просмотра ваш список контактов в этом профиле"
+#: ../../Zotlabs/Module/Profiles.php:698
+msgid "Hide my connections from viewers of this profile"
+msgstr "Скрыть мои контакты от просматривающих этот профиль"
+
+#: ../../Zotlabs/Module/Profiles.php:711
+msgid "Publish my default profile in the network directory"
+msgstr "Опубликовать мой профиль по умолчанию в каталоге сети"
+
+#: ../../Zotlabs/Module/Profiles.php:719
+msgid "Suggest me as a potential contact to new members"
+msgstr "Предлагать меня как потенциальный новый контакт для новых участников"
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:723
+msgid "Reveal my online status"
+msgstr "Показать мой статус в сети"
+
+#: ../../Zotlabs/Module/Profiles.php:764
msgid "Edit Profile Details"
msgstr "Редактирование профиля"
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Profiles.php:766
msgid "View this profile"
msgstr "Посмотреть этот профиль"
-#: ../../Zotlabs/Module/Profiles.php:727 ../../Zotlabs/Module/Profiles.php:826
-#: ../../include/channel.php:1519
+#: ../../Zotlabs/Module/Profiles.php:767 ../../Zotlabs/Module/Profiles.php:871
+#: ../../include/channel.php:1553
msgid "Edit visibility"
msgstr "Редактировать видимость"
-#: ../../Zotlabs/Module/Profiles.php:728
+#: ../../Zotlabs/Module/Profiles.php:768
msgid "Profile Tools"
msgstr "Инструменты профиля"
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:769
msgid "Change cover photo"
msgstr "Изменить фотографию обложки"
-#: ../../Zotlabs/Module/Profiles.php:730 ../../include/channel.php:1489
+#: ../../Zotlabs/Module/Profiles.php:770 ../../include/channel.php:1523
msgid "Change profile photo"
msgstr "Изменить фотографию профиля"
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Zotlabs/Module/Profiles.php:771
msgid "Create a new profile using these settings"
msgstr "Создать новый профиль с теми же настройками"
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Zotlabs/Module/Profiles.php:772
msgid "Clone this profile"
msgstr "Клонировать этот профиль"
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:773
msgid "Delete this profile"
msgstr "Удалить этот профиль"
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:774
msgid "Add profile things"
msgstr "Добавить в профиль"
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Personal"
-msgstr "Личное"
+#: ../../Zotlabs/Module/Profiles.php:775
+msgid "Basic"
+msgstr "Основной"
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:777
msgid "Relationship"
msgstr "Отношения"
-#: ../../Zotlabs/Module/Profiles.php:738 ../../Zotlabs/Widget/Newmember.php:51
+#: ../../Zotlabs/Module/Profiles.php:778 ../../Zotlabs/Widget/Newmember.php:51
#: ../../include/datetime.php:58
msgid "Miscellaneous"
msgstr "Прочее"
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:780
msgid "Import profile from file"
msgstr "Импортировать профиль из файла"
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:781
msgid "Export profile to file"
msgstr "Экспортировать профиль в файл"
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:782
msgid "Your gender"
msgstr "Ваш пол"
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:783
msgid "Marital status"
msgstr "Семейное положение"
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:784
msgid "Sexual preference"
msgstr "Сексуальная ориентация"
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:787
msgid "Profile name"
msgstr "Имя профиля"
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:789
msgid "This is your default profile."
msgstr "Это ваш профиль по умолчанию."
-#: ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Profiles.php:791
msgid "Your full name"
msgstr "Ваше полное имя"
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:792
msgid "Short title/description"
msgstr "Краткий заголовок или наименование"
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:792
msgid "Maximal 190 characters"
msgstr "Не более 190 символов"
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Zotlabs/Module/Profiles.php:795
msgid "Street address"
msgstr "Улица, дом, квартира"
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Zotlabs/Module/Profiles.php:796
msgid "Locality/City"
msgstr "Населенный пункт / город"
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Zotlabs/Module/Profiles.php:797
msgid "Region/State"
msgstr "Регион / Область"
-#: ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Profiles.php:798
msgid "Postal/Zip code"
msgstr "Почтовый индекс"
-#: ../../Zotlabs/Module/Profiles.php:759 ../../Zotlabs/Module/Cdav.php:1397
-#: ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Cdav.php:1397
+#: ../../Zotlabs/Module/Connedit.php:757
msgid "Country"
msgstr "Страна"
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:804
msgid "Who (if applicable)"
msgstr "Кто (если применимо)"
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:804
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "Примеры: ivan1990, Ivan Petrov, ivan@example.com"
-#: ../../Zotlabs/Module/Profiles.php:765
+#: ../../Zotlabs/Module/Profiles.php:805
msgid "Since (date)"
msgstr "С (дата)"
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Zotlabs/Module/Profiles.php:808
msgid "Tell us about yourself"
msgstr "Расскажите нам о себе"
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Zotlabs/Module/Profiles.php:809
#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:68
msgid "Homepage URL"
msgstr "URL домашней страницы"
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Zotlabs/Module/Profiles.php:810
msgid "Hometown"
msgstr "Родной город"
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Zotlabs/Module/Profiles.php:811
msgid "Political views"
msgstr "Политические взгляды"
-#: ../../Zotlabs/Module/Profiles.php:772
+#: ../../Zotlabs/Module/Profiles.php:812
msgid "Religious views"
msgstr "Религиозные взгляды"
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:813
msgid "Keywords used in directory listings"
msgstr "Ключевые слова для участия в каталоге"
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:813
msgid "Example: fishing photography software"
msgstr "Например: fishing photography software"
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Zotlabs/Module/Profiles.php:816
msgid "Musical interests"
msgstr "Музыкальные интересы"
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Zotlabs/Module/Profiles.php:817
msgid "Books, literature"
msgstr "Книги, литература"
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Profiles.php:818
msgid "Television"
msgstr "Телевидение"
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Zotlabs/Module/Profiles.php:819
msgid "Film/Dance/Culture/Entertainment"
msgstr "Кино / танцы / культура / развлечения"
-#: ../../Zotlabs/Module/Profiles.php:780
+#: ../../Zotlabs/Module/Profiles.php:820
msgid "Hobbies/Interests"
msgstr "Хобби / интересы"
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Profiles.php:821
msgid "Love/Romance"
msgstr "Любовь / романтические отношения"
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Zotlabs/Module/Profiles.php:823
msgid "School/Education"
msgstr "Школа / образование"
-#: ../../Zotlabs/Module/Profiles.php:784
+#: ../../Zotlabs/Module/Profiles.php:824
msgid "Contact information and social networks"
msgstr "Информация и социальные сети для связи"
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Zotlabs/Module/Profiles.php:825
msgid "My other channels"
msgstr "Мои другие контакты"
-#: ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Profiles.php:827
msgid "Communications"
msgstr "Связи"
-#: ../../Zotlabs/Module/Profiles.php:788 ../../Zotlabs/Module/Cdav.php:1375
-#: ../../Zotlabs/Module/Connedit.php:911
+#: ../../Zotlabs/Module/Profiles.php:828 ../../Zotlabs/Module/Cdav.php:1375
+#: ../../Zotlabs/Module/Connedit.php:735
msgid "Phone"
msgstr "Телефон"
-#: ../../Zotlabs/Module/Profiles.php:790 ../../Zotlabs/Module/Cdav.php:1377
-#: ../../Zotlabs/Module/Connedit.php:913
+#: ../../Zotlabs/Module/Profiles.php:830 ../../Zotlabs/Module/Cdav.php:1377
+#: ../../Zotlabs/Module/Connedit.php:737
msgid "Instant messenger"
msgstr "Мессенджер"
-#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Cdav.php:1378
-#: ../../Zotlabs/Module/Connedit.php:914
+#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Cdav.php:1378
+#: ../../Zotlabs/Module/Connedit.php:738
msgid "Website"
msgstr "Веб-сайт"
-#: ../../Zotlabs/Module/Profiles.php:793 ../../Zotlabs/Module/Cdav.php:1380
-#: ../../Zotlabs/Module/Connedit.php:916
+#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Cdav.php:1380
+#: ../../Zotlabs/Module/Connedit.php:740
msgid "Note"
msgstr "Заметка"
-#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Cdav.php:1381
-#: ../../Zotlabs/Module/Connedit.php:917 ../../include/event.php:1422
-#: ../../include/connections.php:724
+#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Cdav.php:1381
+#: ../../Zotlabs/Module/Connedit.php:741 ../../include/event.php:1422
+#: ../../include/connections.php:751
msgid "Mobile"
msgstr "Мобильный"
-#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Cdav.php:1382
-#: ../../Zotlabs/Module/Connedit.php:918
+#: ../../Zotlabs/Module/Profiles.php:835 ../../Zotlabs/Module/Cdav.php:1382
+#: ../../Zotlabs/Module/Connedit.php:742
#: ../../Zotlabs/Widget/Notifications.php:36 ../../include/event.php:1423
-#: ../../include/connections.php:725
+#: ../../include/connections.php:752
msgid "Home"
msgstr "Домашний"
-#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Cdav.php:1383
-#: ../../Zotlabs/Module/Connedit.php:919 ../../include/event.php:1426
-#: ../../include/connections.php:728
+#: ../../Zotlabs/Module/Profiles.php:836 ../../Zotlabs/Module/Cdav.php:1383
+#: ../../Zotlabs/Module/Connedit.php:743 ../../include/event.php:1426
+#: ../../include/connections.php:755
msgid "Work"
msgstr "Рабочий"
-#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Cdav.php:1384
-#: ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Access/PermissionRoles.php:310 ../../include/event.php:1429
-#: ../../include/event.php:1436 ../../include/connections.php:731
-#: ../../include/connections.php:738 ../../include/selectors.php:60
+#: ../../Zotlabs/Module/Profiles.php:837 ../../Zotlabs/Module/Cdav.php:1384
+#: ../../Zotlabs/Module/Connedit.php:744
+#: ../../Zotlabs/Access/PermissionRoles.php:360 ../../include/event.php:1429
+#: ../../include/event.php:1436 ../../include/connections.php:758
+#: ../../include/connections.php:765 ../../include/selectors.php:60
#: ../../include/selectors.php:77 ../../include/selectors.php:115
#: ../../include/selectors.php:151
msgid "Other"
msgstr "Другой"
-#: ../../Zotlabs/Module/Profiles.php:798 ../../Zotlabs/Module/Cdav.php:1385
-#: ../../Zotlabs/Module/Connedit.php:921
+#: ../../Zotlabs/Module/Profiles.php:838 ../../Zotlabs/Module/Cdav.php:1385
+#: ../../Zotlabs/Module/Connedit.php:745
msgid "Add Contact"
msgstr "Добавить контакт"
-#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Cdav.php:1386
-#: ../../Zotlabs/Module/Connedit.php:922
+#: ../../Zotlabs/Module/Profiles.php:839 ../../Zotlabs/Module/Cdav.php:1386
+#: ../../Zotlabs/Module/Connedit.php:746
msgid "Add Field"
msgstr "Добавить поле"
-#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Cdav.php:1058
+#: ../../Zotlabs/Module/Profiles.php:840 ../../Zotlabs/Module/Cdav.php:1058
#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Layouts.php:185
#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/New_channel.php:189
#: ../../Zotlabs/Module/Menu.php:182 ../../Zotlabs/Module/Webpages.php:251
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Storage/Browser.php:365
+#: ../../Zotlabs/Module/Connedit.php:747 ../../Zotlabs/Storage/Browser.php:365
#: ../../Zotlabs/Storage/Browser.php:538 ../../Zotlabs/Widget/Cdav.php:140
#: ../../Zotlabs/Widget/Cdav.php:178
msgid "Create"
msgstr "Создать"
-#: ../../Zotlabs/Module/Profiles.php:822 ../../include/channel.php:1515
+#: ../../Zotlabs/Module/Profiles.php:867 ../../include/channel.php:1549
msgid "Profile Image"
msgstr "Изображение профиля"
-#: ../../Zotlabs/Module/Profiles.php:832 ../../include/channel.php:1496
-#: ../../include/nav.php:115
+#: ../../Zotlabs/Module/Profiles.php:877 ../../include/channel.php:1530
+#: ../../include/nav.php:113
msgid "Edit Profiles"
msgstr "Редактирование профилей"
-#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Manage.php:137
+#: ../../Zotlabs/Module/Profiles.php:878 ../../Zotlabs/Module/Manage.php:137
#: ../../Zotlabs/Module/Wiki.php:211
msgid "Create New"
msgstr "Создать новый"
@@ -3334,25 +3382,25 @@ msgstr "Выбрать тег для удаления:"
#: ../../Zotlabs/Module/Connections.php:58
#: ../../Zotlabs/Module/Connections.php:116
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Zotlabs/Module/Connections.php:282
msgid "Active"
msgstr "Активен"
#: ../../Zotlabs/Module/Connections.php:63
#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Zotlabs/Module/Connections.php:287
msgid "Blocked"
msgstr "Заблокирован"
#: ../../Zotlabs/Module/Connections.php:68
#: ../../Zotlabs/Module/Connections.php:189
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Zotlabs/Module/Connections.php:286
msgid "Ignored"
msgstr "Игнорируется"
#: ../../Zotlabs/Module/Connections.php:73
#: ../../Zotlabs/Module/Connections.php:203
-#: ../../Zotlabs/Module/Connections.php:277
+#: ../../Zotlabs/Module/Connections.php:285
msgid "Hidden"
msgstr "Скрыт"
@@ -3369,7 +3417,8 @@ msgstr "Новые"
#: ../../Zotlabs/Module/Connections.php:97
#: ../../Zotlabs/Module/Connections.php:111
-#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:34
+#: ../../Zotlabs/Module/Contactedit.php:299
+#: ../../Zotlabs/Module/Connedit.php:583 ../../Zotlabs/Widget/Affinity.php:34
msgid "All"
msgstr "Все"
@@ -3410,140 +3459,157 @@ msgstr "Показать только скрытые контакты"
msgid "Show all connections"
msgstr "Просмотр всех контактов"
-#: ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Connections.php:283
msgid "Pending approval"
msgstr "Ожидающие подтверждения"
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Zotlabs/Module/Connections.php:284
msgid "Archived"
msgstr "Зархивирован"
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Zotlabs/Module/Connections.php:288
msgid "Not connected at this location"
msgstr "Не подключено в этом месте"
-#: ../../Zotlabs/Module/Connections.php:289
-#: ../../Zotlabs/Module/Viewconnections.php:80 ../../include/text.php:1039
+#: ../../Zotlabs/Module/Connections.php:297
+#: ../../Zotlabs/Module/Viewconnections.php:80 ../../include/text.php:1036
msgid "Accepts"
msgstr "Принимает"
-#: ../../Zotlabs/Module/Connections.php:292
-#: ../../Zotlabs/Module/Viewconnections.php:83 ../../include/text.php:1042
+#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Zotlabs/Module/Viewconnections.php:83 ../../include/text.php:1039
msgid "Comments"
msgstr "комментарии"
-#: ../../Zotlabs/Module/Connections.php:297
-#: ../../Zotlabs/Module/Viewconnections.php:88 ../../include/text.php:1047
+#: ../../Zotlabs/Module/Connections.php:305
+#: ../../Zotlabs/Module/Viewconnections.php:88 ../../include/text.php:1044
msgid "Stream items"
msgstr "публикации в потоке"
-#: ../../Zotlabs/Module/Connections.php:302
-#: ../../Zotlabs/Module/Viewconnections.php:93 ../../include/text.php:1052
+#: ../../Zotlabs/Module/Connections.php:310
+#: ../../Zotlabs/Module/Viewconnections.php:93 ../../include/text.php:1049
msgid "Wall posts"
msgstr "публикации на стене"
-#: ../../Zotlabs/Module/Connections.php:306
-#: ../../Zotlabs/Module/Viewconnections.php:97 ../../include/text.php:1056
+#: ../../Zotlabs/Module/Connections.php:314
+#: ../../Zotlabs/Module/Viewconnections.php:97 ../../include/text.php:1053
msgid "Nothing"
msgstr "ничего"
-#: ../../Zotlabs/Module/Connections.php:319
+#: ../../Zotlabs/Module/Connections.php:327
#, php-format
msgid "%1$s [%2$s]"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:320
+#: ../../Zotlabs/Module/Connections.php:328
msgid "Edit connection"
msgstr "Редактировать контакт"
-#: ../../Zotlabs/Module/Connections.php:322
+#: ../../Zotlabs/Module/Connections.php:330
msgid "Delete connection"
msgstr "Удалить контакт"
-#: ../../Zotlabs/Module/Connections.php:331
+#: ../../Zotlabs/Module/Connections.php:339
msgid "Channel address"
msgstr "Адрес канала"
-#: ../../Zotlabs/Module/Connections.php:333
+#: ../../Zotlabs/Module/Connections.php:341
#: ../../Zotlabs/Widget/Notifications.php:16 ../../include/features.php:290
msgid "Network"
msgstr "Сеть"
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Zotlabs/Module/Connections.php:344
msgid "Call"
msgstr "Вызов"
-#: ../../Zotlabs/Module/Connections.php:338
+#: ../../Zotlabs/Module/Connections.php:346
msgid "Status"
msgstr "Статус"
-#: ../../Zotlabs/Module/Connections.php:340
+#: ../../Zotlabs/Module/Connections.php:348
msgid "Connected"
msgstr "Подключено"
-#: ../../Zotlabs/Module/Connections.php:342
+#: ../../Zotlabs/Module/Connections.php:350
+#: ../../Zotlabs/Module/Contactedit.php:455
msgid "Approve connection"
msgstr "Утвердить контакт"
-#: ../../Zotlabs/Module/Connections.php:344
+#: ../../Zotlabs/Module/Connections.php:352
msgid "Ignore connection"
msgstr "Игнорировать контакт"
-#: ../../Zotlabs/Module/Connections.php:345
-#: ../../Zotlabs/Module/Connedit.php:629
+#: ../../Zotlabs/Module/Connections.php:353
+#: ../../Zotlabs/Module/Contactedit.php:639
+#: ../../Zotlabs/Module/Connedit.php:516
msgid "Ignore"
msgstr "Игнорировать"
-#: ../../Zotlabs/Module/Connections.php:346
+#: ../../Zotlabs/Module/Connections.php:354
msgid "Recent activity"
msgstr "Последние действия"
-#: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:69
+#: ../../Zotlabs/Module/Connections.php:358 ../../Zotlabs/Module/Suggest.php:69
#: ../../Zotlabs/Module/Directory.php:369
#: ../../Zotlabs/Widget/Suggestions.php:46 ../../Zotlabs/Widget/Follow.php:32
-#: ../../include/channel.php:1576 ../../include/connections.php:110
-#: ../../include/conversation.php:1106
+#: ../../include/channel.php:1610 ../../include/connections.php:112
+#: ../../include/conversation.php:1110
msgid "Connect"
msgstr "Подключить"
-#: ../../Zotlabs/Module/Connections.php:352
+#: ../../Zotlabs/Module/Connections.php:360
msgid "Connect at this location"
msgstr "Подключить в этом месте"
-#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:339
-#: ../../include/features.php:133 ../../include/text.php:1031
+#: ../../Zotlabs/Module/Connections.php:369 ../../Zotlabs/Widget/Follow.php:22
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "У вас есть %1$.0f из %2$.0f разрешенных контактов."
+
+#: ../../Zotlabs/Module/Connections.php:391 ../../Zotlabs/Lib/Apps.php:339
+#: ../../include/features.php:133 ../../include/text.php:1028
msgid "Connections"
msgstr "Контакты"
-#: ../../Zotlabs/Module/Connections.php:379 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Module/Connections.php:395 ../../Zotlabs/Module/Search.php:45
#: ../../Zotlabs/Lib/Apps.php:359 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/nav.php:192
-#: ../../include/acl_selectors.php:149 ../../include/text.php:1145
-#: ../../include/text.php:1157
+#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/nav.php:190
+#: ../../include/acl_selectors.php:149 ../../include/text.php:1142
+#: ../../include/text.php:1154
msgid "Search"
msgstr "Поиск"
-#: ../../Zotlabs/Module/Connections.php:380
+#: ../../Zotlabs/Module/Connections.php:396
+#: ../../Zotlabs/Module/Connedit.php:686
+msgid "Contact role"
+msgstr "Роль контакта"
+
+#: ../../Zotlabs/Module/Connections.php:397
msgid "Search your connections"
msgstr "Поиск ваших контактов"
-#: ../../Zotlabs/Module/Connections.php:381
-msgid "Connections search"
-msgstr "Поиск контаков"
+#: ../../Zotlabs/Module/Connections.php:398
+msgid "Contact search"
+msgstr "Поиск контакта"
-#: ../../Zotlabs/Module/Connections.php:382
+#: ../../Zotlabs/Module/Connections.php:399
#: ../../Zotlabs/Module/Directory.php:432
#: ../../Zotlabs/Module/Directory.php:437 ../../include/contact_widgets.php:23
msgid "Find"
msgstr "Поиск"
+#: ../../Zotlabs/Module/Connections.php:405
+#: ../../Zotlabs/Module/Contactedit.php:397
+msgid "This is a group/forum channel"
+msgstr "Это канал группы или форума"
+
#: ../../Zotlabs/Module/Profile_photo.php:93
#: ../../Zotlabs/Module/Cover_photo.php:85
msgid "Image uploaded but image cropping failed."
msgstr "Изображение загружено но обрезка не удалась."
#: ../../Zotlabs/Module/Profile_photo.php:147
-#: ../../Zotlabs/Module/Profile_photo.php:284
+#: ../../Zotlabs/Module/Profile_photo.php:283
#: ../../include/photo/photo_driver.php:434
msgid "Profile Photos"
msgstr "Фотографии профиля"
@@ -3561,132 +3627,132 @@ msgid ""
msgstr "Если новая фотография не отображается немедленно то нажмите Shift + \"Обновить\" для очистки кэша браузера"
#: ../../Zotlabs/Module/Profile_photo.php:261
-#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:199
+#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:198
msgid "Unable to process image"
msgstr "Не удается обработать изображение"
-#: ../../Zotlabs/Module/Profile_photo.php:296
+#: ../../Zotlabs/Module/Profile_photo.php:293
#: ../../Zotlabs/Module/Cover_photo.php:265
msgid "Image upload failed."
msgstr "Загрузка изображения не удалась."
-#: ../../Zotlabs/Module/Profile_photo.php:315
+#: ../../Zotlabs/Module/Profile_photo.php:312
#: ../../Zotlabs/Module/Cover_photo.php:282
msgid "Unable to process image."
msgstr "Невозможно обработать изображение."
-#: ../../Zotlabs/Module/Profile_photo.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:431
+#: ../../Zotlabs/Module/Profile_photo.php:376
+#: ../../Zotlabs/Module/Profile_photo.php:428
#: ../../Zotlabs/Module/Cover_photo.php:367
#: ../../Zotlabs/Module/Cover_photo.php:382
msgid "Photo not available."
msgstr "Фотография недоступна."
-#: ../../Zotlabs/Module/Profile_photo.php:495
+#: ../../Zotlabs/Module/Profile_photo.php:492
msgid ""
"Your default profile photo is visible to anybody on the internet. Profile "
"photos for alternate profiles will inherit the permissions of the profile"
msgstr "Фотография вашего профиля по умолчанию видна всем в Интернете. Фотографияпрофиля для альтернативных профилей наследуют разрешения текущего профиля"
-#: ../../Zotlabs/Module/Profile_photo.php:495
+#: ../../Zotlabs/Module/Profile_photo.php:492
msgid ""
"Your profile photo is visible to anybody on the internet and may be "
"distributed to other websites."
msgstr "Фотография вашего профиля видна всем в Интернете и может быть отправлена на другие сайты."
-#: ../../Zotlabs/Module/Profile_photo.php:497
+#: ../../Zotlabs/Module/Profile_photo.php:494
#: ../../Zotlabs/Module/Cover_photo.php:420
msgid "Upload File:"
msgstr "Загрузить файл:"
-#: ../../Zotlabs/Module/Profile_photo.php:498
+#: ../../Zotlabs/Module/Profile_photo.php:495
#: ../../Zotlabs/Module/Cover_photo.php:421
msgid "Select a profile:"
msgstr "Выбрать профиль:"
-#: ../../Zotlabs/Module/Profile_photo.php:499
+#: ../../Zotlabs/Module/Profile_photo.php:496
msgid "Use Photo for Profile"
msgstr "Использовать фотографию для профиля"
-#: ../../Zotlabs/Module/Profile_photo.php:499
+#: ../../Zotlabs/Module/Profile_photo.php:496
msgid "Change Profile Photo"
msgstr "Изменить фотографию профиля"
-#: ../../Zotlabs/Module/Profile_photo.php:500
+#: ../../Zotlabs/Module/Profile_photo.php:497
msgid "Use"
msgstr "Использовать"
-#: ../../Zotlabs/Module/Profile_photo.php:505
-#: ../../Zotlabs/Module/Profile_photo.php:506
+#: ../../Zotlabs/Module/Profile_photo.php:502
+#: ../../Zotlabs/Module/Profile_photo.php:503
#: ../../Zotlabs/Module/Cover_photo.php:426
#: ../../Zotlabs/Module/Cover_photo.php:427
msgid "Use a photo from your albums"
msgstr "Использовать фотографию из ваших альбомов"
-#: ../../Zotlabs/Module/Profile_photo.php:508
+#: ../../Zotlabs/Module/Profile_photo.php:505
#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:399
-#: ../../include/conversation.php:1465 ../../include/conversation.php:1518
+#: ../../include/conversation.php:1479 ../../include/conversation.php:1532
#: ../../extend/addon/hzaddons/hsse/hsse.php:210
#: ../../extend/addon/hzaddons/hsse/hsse.php:257
msgid "OK"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:509
+#: ../../Zotlabs/Module/Profile_photo.php:506
#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:400
-#: ../../include/conversation.php:1390
+#: ../../include/conversation.php:1404
#: ../../extend/addon/hzaddons/hsse/hsse.php:139
msgid "Choose images to embed"
msgstr "Выбрать изображения для встраивания"
-#: ../../Zotlabs/Module/Profile_photo.php:510
+#: ../../Zotlabs/Module/Profile_photo.php:507
#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:401
-#: ../../include/conversation.php:1391
+#: ../../include/conversation.php:1405
#: ../../extend/addon/hzaddons/hsse/hsse.php:140
msgid "Choose an album"
msgstr "Выбрать альбом"
-#: ../../Zotlabs/Module/Profile_photo.php:511
+#: ../../Zotlabs/Module/Profile_photo.php:508
#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:402
msgid "Choose a different album"
msgstr "Выбрать другой альбом"
-#: ../../Zotlabs/Module/Profile_photo.php:512
+#: ../../Zotlabs/Module/Profile_photo.php:509
#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:403
-#: ../../include/conversation.php:1393
+#: ../../include/conversation.php:1407
#: ../../extend/addon/hzaddons/hsse/hsse.php:142
msgid "Error getting album list"
msgstr "Ошибка получения списка альбомов"
-#: ../../Zotlabs/Module/Profile_photo.php:513
+#: ../../Zotlabs/Module/Profile_photo.php:510
#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:404
-#: ../../include/conversation.php:1394
+#: ../../include/conversation.php:1408
#: ../../extend/addon/hzaddons/hsse/hsse.php:143
msgid "Error getting photo link"
msgstr "Ошибка получения ссылки на фотографию"
-#: ../../Zotlabs/Module/Profile_photo.php:514
+#: ../../Zotlabs/Module/Profile_photo.php:511
#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:405
-#: ../../include/conversation.php:1395
+#: ../../include/conversation.php:1409
#: ../../extend/addon/hzaddons/hsse/hsse.php:144
msgid "Error getting album"
msgstr "Ошибка получения альбома"
-#: ../../Zotlabs/Module/Profile_photo.php:516
+#: ../../Zotlabs/Module/Profile_photo.php:513
#: ../../Zotlabs/Module/Cover_photo.php:438
msgid "Select existing photo"
msgstr "Выбрать существующую фотографию"
-#: ../../Zotlabs/Module/Profile_photo.php:535
+#: ../../Zotlabs/Module/Profile_photo.php:532
#: ../../Zotlabs/Module/Cover_photo.php:455
msgid "Crop Image"
msgstr "Обрезать изображение"
-#: ../../Zotlabs/Module/Profile_photo.php:536
+#: ../../Zotlabs/Module/Profile_photo.php:533
#: ../../Zotlabs/Module/Cover_photo.php:456
msgid "Please adjust the image cropping for optimum viewing."
msgstr "Пожалуйста настройте обрезку изображения для оптимального просмотра."
-#: ../../Zotlabs/Module/Profile_photo.php:538
+#: ../../Zotlabs/Module/Profile_photo.php:535
#: ../../Zotlabs/Module/Cover_photo.php:458
msgid "Done Editing"
msgstr "Закончить редактирование"
@@ -3791,37 +3857,37 @@ msgstr "Не удалось получить содержимое календа
msgid "Categories"
msgstr "Категории"
-#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:909
+#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:733
msgid "Organisation"
msgstr "Организация"
-#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:910
+#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:734
#: ../../extend/addon/hzaddons/workflow/workflow.php:2617
#: ../../extend/addon/hzaddons/workflow/workflow.php:2678
msgid "Title"
msgstr "Наименование"
-#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:751
msgid "P.O. Box"
msgstr "абонентский ящик"
-#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:752
msgid "Additional"
msgstr "Дополнительно"
-#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:753
msgid "Street"
msgstr "Улица"
-#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:754
msgid "Locality"
msgstr "Населённый пункт"
-#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:931
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:755
msgid "Region"
msgstr "Регион"
-#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:756
msgid "ZIP Code"
msgstr "Индекс"
@@ -3989,7 +4055,7 @@ msgid "System Notifications"
msgstr "Системные оповещения "
#: ../../Zotlabs/Module/Notifications.php:111
-#: ../../Zotlabs/Lib/ThreadItem.php:484
+#: ../../Zotlabs/Lib/ThreadItem.php:507
msgid "Mark all seen"
msgstr "Отметить как просмотренное"
@@ -4008,7 +4074,7 @@ msgstr "Видимо для:"
#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Webpages.php:39
#: ../../Zotlabs/Module/Profile.php:27 ../../Zotlabs/Module/Articles.php:43
#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
-#: ../../include/channel.php:1394
+#: ../../include/channel.php:1427
#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:49
msgid "Requested profile is not available."
msgstr "Запрашиваемый профиль не доступен."
@@ -4069,16 +4135,16 @@ msgid "View Common Connections"
msgstr "Просмотр общий контактов"
#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Module/Tagger.php:71
-#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Lib/Activity.php:3306
-#: ../../include/conversation.php:128 ../../include/text.php:2251
+#: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Lib/Activity.php:3389
+#: ../../include/conversation.php:128 ../../include/text.php:2279
#: ../../extend/addon/hzaddons/redphotos/redphotohelper.php:71
-#: ../../extend/addon/hzaddons/pubcrawl/as.php:1940
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1943
#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1626
msgid "photo"
msgstr "фото"
-#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Module/Like.php:439
-#: ../../extend/addon/hzaddons/pubcrawl/as.php:1940
+#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Module/Like.php:445
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1943
#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1626
msgid "status"
msgstr "статус"
@@ -4122,41 +4188,56 @@ msgstr "Запись цензурирована"
msgid "Entry uncensored"
msgstr "Запись нецензурирована"
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:72
-msgid "Nothing to import."
-msgstr "Ничего импортировать."
-
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:87
-#: ../../Zotlabs/Module/Import.php:102
-msgid "Unable to download data from old server"
-msgstr "Невозможно загрузить данные со старого сервера"
-
-#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:109
-msgid "Imported file is empty."
-msgstr "Импортированный файл пуст."
-
-#: ../../Zotlabs/Module/Import_items.php:93
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Предупреждение: Версия базы данных отличается от %1$d обновления."
-
-#: ../../Zotlabs/Module/Import_items.php:108
-msgid "Import completed"
-msgstr "Импорт завершён."
+#: ../../Zotlabs/Module/Import_items.php:50
+msgid "Not a zip file or zip file corrupted."
+msgstr "Не zip файл или повреждённый zip файл."
-#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Zotlabs/Module/Import_items.php:121
msgid "Import Items"
msgstr "Импортировать объекты"
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Zotlabs/Module/Import_items.php:122
msgid "Use this form to import existing posts and content from an export file."
msgstr "Используйте эту форму для импорта существующих публикаций и содержимого из файла."
-#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:585
+#: ../../Zotlabs/Module/Import_items.php:123
+#: ../../Zotlabs/Module/Import.php:594
msgid "File to Upload"
msgstr "Файл для загрузки"
+#: ../../Zotlabs/Module/Import_items.php:136
+#: ../../Zotlabs/Module/Import.php:107
+msgid "Imported file is empty."
+msgstr "Импортированный файл пуст."
+
+#: ../../Zotlabs/Module/Import_items.php:159
+msgid "Content import completed"
+msgstr "Импорт содержимого завершён"
+
+#: ../../Zotlabs/Module/Import_items.php:164
+msgid "Chatroom import completed"
+msgstr "Импорт комнат чатов завершён"
+
+#: ../../Zotlabs/Module/Import_items.php:170
+msgid "Channel calendar import 1/2 completed"
+msgstr "Импорт календаря канала завершён на 1/2"
+
+#: ../../Zotlabs/Module/Import_items.php:176
+msgid "Channel calendar import 2/2 completed"
+msgstr "Импорт календаря канала завершён на 2/2"
+
+#: ../../Zotlabs/Module/Import_items.php:181
+msgid "Menu import completed"
+msgstr "Импорт меню завершён"
+
+#: ../../Zotlabs/Module/Import_items.php:186
+msgid "Wiki import completed"
+msgstr "Импорт wiki завершён"
+
+#: ../../Zotlabs/Module/Import_items.php:191
+msgid "Webpages import completed"
+msgstr "Импорт веб-страниц завершён"
+
#: ../../Zotlabs/Module/Page.php:173
msgid ""
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
@@ -4167,134 +4248,135 @@ msgid ""
"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
msgstr ""
-#: ../../Zotlabs/Module/Regate.php:81
+#: ../../Zotlabs/Module/Regate.php:84
msgid "Email resent"
msgstr "Электронная почта повторно отправлена"
-#: ../../Zotlabs/Module/Regate.php:81
+#: ../../Zotlabs/Module/Regate.php:84
msgid "Email resend failed"
msgstr "Ошибка повторной отправки электронной почты"
-#: ../../Zotlabs/Module/Regate.php:106
+#: ../../Zotlabs/Module/Regate.php:109
msgid "Verification successful"
msgstr "Проверка прошла успешно"
-#: ../../Zotlabs/Module/Regate.php:150
+#: ../../Zotlabs/Module/Regate.php:153
msgid "Account successfull created"
msgstr "Учётная запись успешно создана"
-#: ../../Zotlabs/Module/Regate.php:191
+#: ../../Zotlabs/Module/Regate.php:211
msgid "Channel successfull created"
msgstr "Канал успешно создан"
-#: ../../Zotlabs/Module/Regate.php:197
+#: ../../Zotlabs/Module/Regate.php:217
msgid "Automatic channel creation failed. Please create a channel."
msgstr "Автоматической создание канала не удалось. Пожалуйста создайте канал."
-#: ../../Zotlabs/Module/Regate.php:209
+#: ../../Zotlabs/Module/Regate.php:229
msgid "Account creation error"
msgstr "Ошибка создания учётной записи"
-#: ../../Zotlabs/Module/Regate.php:221
+#: ../../Zotlabs/Module/Regate.php:241
msgid "Verify failed"
msgstr "Проверка не удалась"
-#: ../../Zotlabs/Module/Regate.php:226
+#: ../../Zotlabs/Module/Regate.php:246
msgid "Token verification failed"
msgstr "Неверный проверочный код"
-#: ../../Zotlabs/Module/Regate.php:231
+#: ../../Zotlabs/Module/Regate.php:251
msgid "Request not inside time frame"
msgstr "Запрос в не установленные сроки "
-#: ../../Zotlabs/Module/Regate.php:237 ../../Zotlabs/Module/Regate.php:267
+#: ../../Zotlabs/Module/Regate.php:257 ../../Zotlabs/Module/Regate.php:287
msgid "Identity unknown"
msgstr "Личность не установлена"
-#: ../../Zotlabs/Module/Regate.php:243
+#: ../../Zotlabs/Module/Regate.php:263
msgid "dId2 mistaken"
msgstr "ошибочный dId2"
-#: ../../Zotlabs/Module/Regate.php:271
+#: ../../Zotlabs/Module/Regate.php:291
msgid "Your Registration ID"
msgstr "Идентификатор вашей регистрации"
-#: ../../Zotlabs/Module/Regate.php:284 ../../Zotlabs/Module/Regate.php:376
-#: ../../Zotlabs/Module/Regate.php:408
+#: ../../Zotlabs/Module/Regate.php:304 ../../Zotlabs/Module/Regate.php:396
+#: ../../Zotlabs/Module/Regate.php:428
msgid "Registration verification"
msgstr "Проверка регистрации"
-#: ../../Zotlabs/Module/Regate.php:291 ../../Zotlabs/Module/Regate.php:413
+#: ../../Zotlabs/Module/Regate.php:311 ../../Zotlabs/Module/Regate.php:433
msgid "Hold on, you can start verification in"
msgstr "Подождите, вы можете начать проверку через "
-#: ../../Zotlabs/Module/Regate.php:292
+#: ../../Zotlabs/Module/Regate.php:312
msgid "Please remember your verification token for ID"
msgstr "Пожалуйста, запомните свой код подтверждения для идентификации"
-#: ../../Zotlabs/Module/Regate.php:294
+#: ../../Zotlabs/Module/Regate.php:314
msgid "Token validity"
msgstr "Срок действия кода"
-#: ../../Zotlabs/Module/Regate.php:330
+#: ../../Zotlabs/Module/Regate.php:350
msgid "Resend email"
msgstr "Отправить электронное письмо повторно"
-#: ../../Zotlabs/Module/Regate.php:335
+#: ../../Zotlabs/Module/Regate.php:355
msgid "Registration status"
msgstr "Статус регистрации"
-#: ../../Zotlabs/Module/Regate.php:338
+#: ../../Zotlabs/Module/Regate.php:358
msgid "Verification successful!"
msgstr "Проверка прошла успешно! "
-#: ../../Zotlabs/Module/Regate.php:339
+#: ../../Zotlabs/Module/Regate.php:359
msgid "Your login ID is"
msgstr "Ваш логин для входа"
-#: ../../Zotlabs/Module/Regate.php:340
+#: ../../Zotlabs/Module/Regate.php:360
msgid ""
"After your account has been approved by our administrator you will be able "
"to login with your login ID and your provided password."
msgstr "После того, как ваша учетная запись будет одобрена нашим администратором, вы сможете войти в систему, указав свой логин и пароль."
-#: ../../Zotlabs/Module/Regate.php:352
+#: ../../Zotlabs/Module/Regate.php:372
msgid "Registration request revoked"
msgstr "Запрос на регистрацию был отозван"
-#: ../../Zotlabs/Module/Regate.php:353
+#: ../../Zotlabs/Module/Regate.php:373
msgid "Sorry for any inconvience. Thank you for your response."
msgstr "Приносим извинения за неудобства. Благодарим за ваш ответ."
-#: ../../Zotlabs/Module/Regate.php:377
+#: ../../Zotlabs/Module/Regate.php:397
msgid "Please enter your verification token for ID"
msgstr "Пожалуйста введите ваш проверочный код для идентификации"
-#: ../../Zotlabs/Module/Regate.php:378 ../../Zotlabs/Module/Regate.php:405
+#: ../../Zotlabs/Module/Regate.php:398 ../../Zotlabs/Module/Regate.php:425
msgid "Please check your email!"
msgstr "Пожалуйста, проверьте вашу электронную почту!"
-#: ../../Zotlabs/Module/Regate.php:388
+#: ../../Zotlabs/Module/Regate.php:408
msgid "Verification token"
msgstr "Код проверки"
-#: ../../Zotlabs/Module/Regate.php:399
+#: ../../Zotlabs/Module/Regate.php:419
msgid "ID expired"
msgstr "Срок действия идентификатора истёк"
-#: ../../Zotlabs/Module/Regate.php:414
+#: ../../Zotlabs/Module/Regate.php:434
msgid "You will require the verification token for ID"
msgstr "Вам потребуется проверочный кода для идентификации"
-#: ../../Zotlabs/Module/Regate.php:423
+#: ../../Zotlabs/Module/Regate.php:443
msgid "Unknown or expired ID"
msgstr "Идентификатор неизвестен или с истекшим сроком действия"
-#: ../../Zotlabs/Module/Regate.php:434
+#: ../../Zotlabs/Module/Regate.php:454
msgid "dId2 malformed"
msgstr "Неверный dId2"
-#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2236
+#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2308
+#: ../../include/items.php:3322
#, php-format
msgid "&#x1f501; Repeated %1$s's %2$s"
msgstr "&#x1f501; Повторил %1$s %2$s"
@@ -4303,28 +4385,28 @@ msgstr "&#x1f501; Повторил %1$s %2$s"
msgid "Post repeated"
msgstr "Публикация повторяется"
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:348
+#: ../../Zotlabs/Module/Impel.php:47 ../../include/bbcode.php:348
msgid "webpage"
msgstr "веб-страница"
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:354
+#: ../../Zotlabs/Module/Impel.php:52 ../../include/bbcode.php:354
msgid "block"
msgstr "заблокировать"
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:351
+#: ../../Zotlabs/Module/Impel.php:57 ../../include/bbcode.php:351
msgid "layout"
msgstr "шаблон"
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:357
+#: ../../Zotlabs/Module/Impel.php:64 ../../include/bbcode.php:357
msgid "menu"
msgstr "меню"
-#: ../../Zotlabs/Module/Impel.php:185
+#: ../../Zotlabs/Module/Impel.php:188
#, php-format
msgid "%s element installed"
msgstr "%s элемент установлен"
-#: ../../Zotlabs/Module/Impel.php:188
+#: ../../Zotlabs/Module/Impel.php:191
#, php-format
msgid "%s element installation failed"
msgstr "%sустановка элемента неудачна."
@@ -4364,13 +4446,13 @@ msgstr "Название шаблона"
msgid "Layout Description (Optional)"
msgstr "Описание шаблона (необязательно)"
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2690
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2718
msgid "Layouts"
msgstr "Шаблоны"
#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:354
#: ../../include/help.php:118 ../../include/help.php:126
-#: ../../include/nav.php:178 ../../include/nav.php:317
+#: ../../include/nav.php:176 ../../include/nav.php:315
msgid "Help"
msgstr "Помощь"
@@ -4407,7 +4489,7 @@ msgid "Bookmark added"
msgstr "Закладка добавлена"
#: ../../Zotlabs/Module/Bookmarks.php:90 ../../Zotlabs/Lib/Apps.php:335
-#: ../../include/nav.php:495
+#: ../../include/nav.php:493
msgid "Bookmarks"
msgstr "Закладки"
@@ -4415,12 +4497,13 @@ msgstr "Закладки"
msgid "My Connections Bookmarks"
msgstr "Закладки моих контактов"
-#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:90
+#: ../../Zotlabs/Module/Defperms.php:67 ../../Zotlabs/Module/Contactedit.php:78
+#: ../../Zotlabs/Module/Connedit.php:80
msgid "Could not access contact record."
msgstr "Не удалось получить доступ к записи контакта."
-#: ../../Zotlabs/Module/Defperms.php:112
-#: ../../Zotlabs/Module/Settings/Channel.php:269
+#: ../../Zotlabs/Module/Defperms.php:111
+#: ../../Zotlabs/Module/Settings/Channel.php:146
#: ../../extend/addon/hzaddons/twitter/twitter.php:493
#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:82
#: ../../extend/addon/hzaddons/piwik/piwik.php:116
@@ -4432,63 +4515,59 @@ msgstr "Не удалось получить доступ к записи кон
msgid "Settings updated."
msgstr "Настройки обновлены."
-#: ../../Zotlabs/Module/Defperms.php:253 ../../Zotlabs/Module/Connedit.php:852
+#: ../../Zotlabs/Module/Defperms.php:252
msgid "Connection Default Permissions"
msgstr "Разрешения по умолчанию для контакта"
-#: ../../Zotlabs/Module/Defperms.php:254 ../../Zotlabs/Module/Connedit.php:853
+#: ../../Zotlabs/Module/Defperms.php:253
msgid "Apply these permissions automatically"
msgstr "Применить эти разрешения автоматически"
-#: ../../Zotlabs/Module/Defperms.php:254
-#: ../../Zotlabs/Module/Settings/Channel.php:474
+#: ../../Zotlabs/Module/Defperms.php:253
msgid ""
"If enabled, connection requests will be approved without your interaction"
msgstr "Если включено, запросы контактов будут одобрены без вашего участия"
-#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:854
+#: ../../Zotlabs/Module/Defperms.php:254
msgid "Permission role"
msgstr "Роль разрешения"
-#: ../../Zotlabs/Module/Defperms.php:255
+#: ../../Zotlabs/Module/Defperms.php:254
#: ../../Zotlabs/Module/New_channel.php:157
#: ../../Zotlabs/Module/New_channel.php:164
-#: ../../Zotlabs/Module/Connedit.php:854
#: ../../Zotlabs/Widget/Notifications.php:166
-#: ../../Zotlabs/Widget/Messages.php:28 ../../include/nav.php:321
+#: ../../Zotlabs/Widget/Messages.php:28 ../../include/nav.php:319
msgid "Loading"
msgstr "Загрузка"
-#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:855
+#: ../../Zotlabs/Module/Defperms.php:255
msgid "Add permission role"
msgstr "Добавить роль разрешения"
-#: ../../Zotlabs/Module/Defperms.php:260 ../../Zotlabs/Module/Connedit.php:868
+#: ../../Zotlabs/Module/Defperms.php:259 ../../Zotlabs/Module/Connedit.php:700
msgid ""
"The permissions indicated on this page will be applied to all new "
"connections."
msgstr "Разрешения, указанные на этой странице, будут применяться ко всем новым соединениям."
-#: ../../Zotlabs/Module/Defperms.php:261
+#: ../../Zotlabs/Module/Defperms.php:260
msgid "Automatic approval settings"
msgstr "Настройки автоматического одобрения"
-#: ../../Zotlabs/Module/Defperms.php:263 ../../Zotlabs/Module/Permcats.php:122
-#: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Tokens.php:181
+#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Permcats.php:238
+#: ../../Zotlabs/Module/Connedit.php:713
msgid "inherited"
msgstr "наследуется"
-#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Permcats.php:120
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Tokens.php:179
+#: ../../Zotlabs/Module/Defperms.php:264
msgid "My Settings"
msgstr "Мои настройки"
-#: ../../Zotlabs/Module/Defperms.php:268 ../../Zotlabs/Module/Permcats.php:125
-#: ../../Zotlabs/Module/Connedit.php:895 ../../Zotlabs/Module/Tokens.php:184
+#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:720
msgid "Individual Permissions"
msgstr "Индивидуальные разрешения"
-#: ../../Zotlabs/Module/Defperms.php:269
+#: ../../Zotlabs/Module/Defperms.php:268
msgid ""
"Some individual permissions may have been preset or locked based on your "
"channel type and privacy settings."
@@ -4552,11 +4631,11 @@ msgstr "Рекомендации каналов"
msgid "Documentation Search"
msgstr "Поиск документации"
-#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:439
+#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:437
msgid "About"
msgstr "О себе"
-#: ../../Zotlabs/Module/Help.php:84 ../../Zotlabs/Module/Group.php:154
+#: ../../Zotlabs/Module/Help.php:84 ../../Zotlabs/Module/Group.php:173
msgid "Members"
msgstr "Участники"
@@ -4634,35 +4713,63 @@ msgstr "Показать URL этого файла"
msgid "Show in your contacts shared folder"
msgstr "Показать общий каталог в ваших контактах"
-#: ../../Zotlabs/Module/Permcats.php:29
+#: ../../Zotlabs/Module/Permcats.php:56
+msgid "Contact role deleted."
+msgstr "Роль контакта удалена."
+
+#: ../../Zotlabs/Module/Permcats.php:82
msgid "Permission category name is required."
msgstr "Требуется категория разрешений."
-#: ../../Zotlabs/Module/Permcats.php:48
-msgid "Permission category saved."
-msgstr "Категория разрешения сохранена."
+#: ../../Zotlabs/Module/Permcats.php:98 ../../Zotlabs/Module/Permcats.php:123
+msgid "Contact role saved."
+msgstr "Роль контакта сохранена."
-#: ../../Zotlabs/Module/Permcats.php:78
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
-msgstr "Используйте эту форму для создания правил разрешений для различных групп людей и контактов."
+#: ../../Zotlabs/Module/Permcats.php:188
+msgid "Role to assign affected contacts and default role to"
+msgstr "Назначить роль выбранных контактов и роль по умолчанию для"
-#: ../../Zotlabs/Module/Permcats.php:111 ../../Zotlabs/Lib/Apps.php:380
-msgid "Permission Categories"
-msgstr "Категории разрешений"
+#: ../../Zotlabs/Module/Permcats.php:188
+msgid "Role to assign affected contacts to"
+msgstr "Назначить роль выбранных контактов для"
+
+#: ../../Zotlabs/Module/Permcats.php:219
+msgid "Assign this role to"
+msgstr "Назначить эту роль для"
+
+#: ../../Zotlabs/Module/Permcats.php:221
+msgid "All my contacts"
+msgstr "Все мои контакты"
+
+#: ../../Zotlabs/Module/Permcats.php:232
+msgid "Automatically assign this role to new contacts"
+msgstr "Автоматически назначать эту роль для новых контактов"
+
+#: ../../Zotlabs/Module/Permcats.php:233
+msgid "Contact Roles"
+msgstr "Роли контактов"
+
+#: ../../Zotlabs/Module/Permcats.php:234
+msgid "Role name"
+msgstr "Наименование роли"
-#: ../../Zotlabs/Module/Permcats.php:119
-msgid "Permission category name"
-msgstr "Наименование категории разрешений"
+#: ../../Zotlabs/Module/Permcats.php:234
+msgid "System role - not editable"
+msgstr "Системная роль (не редактируется)"
-#: ../../Zotlabs/Module/Permcats.php:126 ../../Zotlabs/Module/Connedit.php:896
-#: ../../Zotlabs/Module/Tokens.php:185
+#: ../../Zotlabs/Module/Permcats.php:235
+msgid "Deleting"
+msgstr "Удаляем"
+
+#: ../../Zotlabs/Module/Permcats.php:240
+msgid "Role Permissions"
+msgstr "Разрешения роли"
+
+#: ../../Zotlabs/Module/Permcats.php:241
msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can <strong>not</strong> change those settings here."
-msgstr "Некоторые разрешения могут наследовать из <a href=\"settings\"><strong>настроек приватности</strong></a> ваших каналов которые могут иметь более высокий приоритет чем индивидуальные. Вы <strong>не можете</strong> менять эти настройки здесь."
+"Some permissions may be inherited from your <a href=\"settings\">channel "
+"role</a>, which have higher priority than contact role settings."
+msgstr "Некоторые разрешения могут быть унаследованы от вашей <a href=\"settings\">роли канала</a>, которые имеют более высокий приоритет, чем настройки роли контакта."
#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
#: ../../Zotlabs/Module/Blocks.php:155
@@ -4677,20 +4784,20 @@ msgstr "Редактировать блок"
msgid "Post not found."
msgstr "Публикация не найдена"
-#: ../../Zotlabs/Module/Tagger.php:75 ../../Zotlabs/Module/Like.php:441
+#: ../../Zotlabs/Module/Tagger.php:75 ../../Zotlabs/Module/Like.php:447
#: ../../Zotlabs/Module/Channel_calendar.php:221 ../../include/event.php:1259
-#: ../../include/conversation.php:132 ../../include/text.php:2254
+#: ../../include/conversation.php:132 ../../include/text.php:2282
msgid "event"
msgstr "событие"
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3306
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3389
#: ../../include/conversation.php:158 ../../include/bbcode.php:555
-#: ../../include/markdown.php:205 ../../include/text.php:2257
+#: ../../include/markdown.php:205 ../../include/text.php:2285
msgid "post"
msgstr "публикация"
#: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160
-#: ../../include/text.php:2259
+#: ../../include/text.php:2287
msgid "comment"
msgstr "комментарий"
@@ -4755,14 +4862,14 @@ msgstr "Я на связи"
msgid "Bookmark this room"
msgstr "Запомнить эту комнату"
-#: ../../Zotlabs/Module/Chat.php:216 ../../include/conversation.php:1385
+#: ../../Zotlabs/Module/Chat.php:216 ../../include/conversation.php:1399
#: ../../extend/addon/hzaddons/hsse/hsse.php:134
#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:135
msgid "Please enter a link URL:"
msgstr "Пожалуйста введите URL ссылки:"
-#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:841
-#: ../../include/conversation.php:1516
+#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:864
+#: ../../include/conversation.php:1530
#: ../../extend/addon/hzaddons/hsse/hsse.php:255
#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:211
msgid "Encrypt text"
@@ -4801,7 +4908,7 @@ msgstr "Срок действия"
msgid "min"
msgstr "мин."
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2688
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2716
msgid "Blocks"
msgstr "Блокировки"
@@ -4809,6 +4916,88 @@ msgstr "Блокировки"
msgid "Block Title"
msgstr "Заблокировать заголовок"
+#: ../../Zotlabs/Module/Settings/Privacy.php:39
+msgid "Privacy settings updated."
+msgstr "Настройки конфиденциальности обновлены."
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:56
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:136
+msgid "Only me"
+msgstr "Только мне"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:57
+msgid "Only those you specifically allow"
+msgstr "Только персонально разрешённые"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:58
+msgid "Approved connections"
+msgstr "Одобренные контакты"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:59
+msgid "Any connections"
+msgstr "Любые контакты"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:60
+msgid "Anybody on this website"
+msgstr "Любой на этом сайте"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:61
+msgid "Anybody in this network"
+msgstr "Любой в этой сети"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:62
+msgid "Anybody authenticated"
+msgstr "Любой аутентифицированный"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:63
+msgid "Anybody on the internet"
+msgstr "Любой в интернете"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:73
+msgid ""
+"Advise: set to \"Anybody on the internet\" and use privacy groups to "
+"restrict access"
+msgstr "Совет: установите значение «Кто угодно в Интернете» и используйте группы конфиденциальности для ограничения доступа."
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:109
+msgid "Privacy Settings"
+msgstr "Настройки конфиденциальности"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:114
+msgid "Advanced configuration"
+msgstr "Расширенная конфигурация"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:116
+msgid "Proceed with caution"
+msgstr "Применять с осторожностью"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:117
+msgid ""
+"Changing advanced configuration settings can impact your, and your contacts "
+"channels functionality and security."
+msgstr "Изменение дополнительных параметров конфигурации может повлиять на работу и безопасность ваших каналов и контактов."
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:118
+msgid "Accept the risk and continue"
+msgstr "Принять риск и продолжить"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:120
+msgid "Automatically approve new contacts"
+msgstr "Автоматически одобрять новые контакты"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:121
+msgid "Opt-out of search engine indexing"
+msgstr "Исключить из индексирования поисковых систем"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
+msgid "Group actor"
+msgstr "Представление группы"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
+msgid "Allow this channel to act as a forum"
+msgstr "Разрешить выступать этому каналу в качестве форума"
+
#: ../../Zotlabs/Module/Settings/Directory.php:40
msgid "Directory Settings"
msgstr "Настройки каталога"
@@ -5011,433 +5200,284 @@ msgstr "Настройки главной страницы канала"
msgid "Profiles Settings"
msgstr "Настройки профилей"
-#: ../../Zotlabs/Module/Settings/Channel.php:71
-#: ../../Zotlabs/Module/Settings/Channel.php:75
-#: ../../Zotlabs/Module/Settings/Channel.php:76
-#: ../../Zotlabs/Module/Settings/Channel.php:79
-#: ../../Zotlabs/Module/Settings/Channel.php:90
-#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:32
-#: ../../include/channel.php:457 ../../include/channel.php:460
-#: ../../include/selectors.php:134
-msgid "Friends"
-msgstr "Друзья"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:331
-msgid "Nobody except yourself"
-msgstr "Никто кроме вас"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:332
-msgid "Only those you specifically allow"
-msgstr "Только персонально разрешённые"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:333
-msgid "Approved connections"
-msgstr "Одобренные контакты"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:334
-msgid "Any connections"
-msgstr "Любые контакты"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:335
-msgid "Anybody on this website"
-msgstr "Любой на этом сайте"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:336
-msgid "Anybody in this network"
-msgstr "Любой в этой сети"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:337
-msgid "Anybody authenticated"
-msgstr "Любой аутентифицированный"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:338
-msgid "Anybody on the internet"
-msgstr "Любой в интернете"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:413
-msgid "Publish your default profile in the network directory"
-msgstr "Публиковать ваш профиль по умолчанию в сетевом каталоге"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:418
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Разрешить предлагать вас как потенциального друга для новых пользователей?"
+#: ../../Zotlabs/Module/Settings/Channel.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:212
+msgid "Please select a channel role"
+msgstr "Пожалуйста, выберите роль канала"
-#: ../../Zotlabs/Module/Settings/Channel.php:431
+#: ../../Zotlabs/Module/Settings/Channel.php:189
msgid "Your channel address is"
msgstr "Адрес вашего канала"
-#: ../../Zotlabs/Module/Settings/Channel.php:434
+#: ../../Zotlabs/Module/Settings/Channel.php:192
msgid "Your files/photos are accessible via WebDAV at"
msgstr "Ваши файлы / фотографии доступны через WebDAV по"
-#: ../../Zotlabs/Module/Settings/Channel.php:474
-msgid "Automatic membership approval"
-msgstr "Членство одобрено автоматически"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:223
msgid "Channel Settings"
msgstr "Настройки канала"
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Zotlabs/Module/Settings/Channel.php:228
+#: ../../Zotlabs/Module/New_channel.php:178
+msgid "Channel role"
+msgstr "Роль канала"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:230
msgid "Basic Settings"
msgstr "Основные настройки"
-#: ../../Zotlabs/Module/Settings/Channel.php:505 ../../include/channel.php:1721
-msgid "Full Name:"
-msgstr "Полное имя:"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:506
-msgid "Email Address:"
-msgstr "Адрес email:"
+#: ../../Zotlabs/Module/Settings/Channel.php:231
+msgid "Channel timezone:"
+msgstr "Часовой пояс канала:"
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "Your Timezone:"
-msgstr "Часовой пояс:"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:508
-msgid "Default Post Location:"
-msgstr "Расположение по умолчанию:"
+#: ../../Zotlabs/Module/Settings/Channel.php:232
+msgid "Default post location:"
+msgstr "Местоположение публикации по умолчанию:"
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:232
msgid "Geographical location to display on your posts"
msgstr "Показывать географическое положение в ваших публикациях"
-#: ../../Zotlabs/Module/Settings/Channel.php:509
-msgid "Use Browser Location:"
-msgstr "Определять расположение из браузера"
+#: ../../Zotlabs/Module/Settings/Channel.php:233
+msgid "Use browser location:"
+msgstr "Использовать данные о местоположении браузера:"
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Zotlabs/Module/Settings/Channel.php:234
msgid "Adult Content"
msgstr "Содержимое для взрослых"
-#: ../../Zotlabs/Module/Settings/Channel.php:511
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Этот канал часто или регулярно публикует содержимое для взрослых. Пожалуйста, помечайте любой такой материал тегом #NSFW"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:513
-msgid "Security and Privacy Settings"
-msgstr "Безопасность и настройки приватности"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:515
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "Ваши разрешения уже настроены. Нажмите чтобы просмотреть или изменить"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:517
-msgid "Hide my online presence"
-msgstr "Скрывать моё присутствие онлайн"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:517
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Предотвращает отображения статуса \"в сети\" в вашем профиле"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:519
-msgid "Simple Privacy Settings:"
-msgstr "Простые настройки безопасности:"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:520
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Полностью открытый - <em>сверхлиберальный (должен использоваться с осторожностью)</em>"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:521
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr "Обычный - <em>открытый по умолчанию, приватность по желанию (как в социальных сетях, но с улучшенными настройками)</em>"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:522
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Частный - <em>частный по умочанию, не открытый и не публичный</em>"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:523
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Закрытый - <em>заблокированный по умолчанию от / для всех</em>"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Allow others to tag your posts"
-msgstr "Разрешить другим отмечать ваши публикации"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr "Часто используется сообществом для маркировки неподобающего содержания"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:527
-msgid "Channel Permission Limits"
-msgstr "Ограничения разрешений канала"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "Expire other channel content after this many days"
-msgstr "Храненить содержимое других каналов, дней"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "0 or blank to use the website limit."
-msgstr "0 или пусто - использовать настройки сайта."
-
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-#, php-format
-msgid "This website expires after %d days."
-msgstr "Срок хранения содержимого этого сайта истекает через %d дней"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "This website does not expire imported content."
-msgstr "Срок хранения импортированного содержимого этого сайта не ограничен."
-
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "The website limit takes precedence if lower than your limit."
-msgstr "Ограничение сайта имеет приоритет если ниже вашего значения."
+#: ../../Zotlabs/Module/Settings/Channel.php:234
+msgid "This channel frequently or regularly publishes adult content"
+msgstr "На этом канале часто или регулярно публикуется контент для взрослых"
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Zotlabs/Module/Settings/Channel.php:235
msgid "Maximum Friend Requests/Day:"
msgstr "Запросов в друзья в день:"
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Zotlabs/Module/Settings/Channel.php:235
msgid "May reduce spam activity"
msgstr "Может ограничить спам активность"
-#: ../../Zotlabs/Module/Settings/Channel.php:531
-msgid "Default Privacy Group"
-msgstr "Группа конфиденциальности по умолчанию"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:532
-#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-msgid "(click to open/close)"
-msgstr "(нажмите чтобы открыть/закрыть)"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:533
-msgid "Use my default audience setting for the type of object published"
-msgstr "Использовать настройки аудитории по умолчанию для типа опубликованного объекта"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:541
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid "Channel role and privacy"
-msgstr "Роль и конфиденциальность канала"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:542
-msgid "Default permissions category"
-msgstr "Категория разрешений по умолчанию"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:548
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Максимально количество сообщений от незнакомых людей, в день:"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:548
-msgid "Useful to reduce spamming"
-msgstr "Полезно для сокращения количества спама"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Zotlabs/Module/Settings/Channel.php:236
#: ../../Zotlabs/Lib/Enotify.php:68
msgid "Notification Settings"
msgstr "Настройки уведомлений"
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Zotlabs/Module/Settings/Channel.php:237
msgid "By default post a status message when:"
msgstr "По умолчанию публиковать новый статус при:"
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:238
msgid "accepting a friend request"
msgstr "одобрении запроса в друзья"
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Zotlabs/Module/Settings/Channel.php:239
msgid "joining a forum/community"
msgstr "вступлении в сообщество / форум"
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:240
msgid "making an <em>interesting</em> profile change"
msgstr "<em>интересном</em> изменении профиля"
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:241
msgid "Send a notification email when:"
msgstr "Отправить уведомление по email когда:"
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:242
msgid "You receive a connection request"
msgstr "вы получили новый запрос контакта"
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:243
msgid "Your connections are confirmed"
msgstr "Ваш запрос контакта был одобрен"
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Zotlabs/Module/Settings/Channel.php:244
msgid "Someone writes on your profile wall"
msgstr "Кто-то написал на стене вашего профиля"
-#: ../../Zotlabs/Module/Settings/Channel.php:560
+#: ../../Zotlabs/Module/Settings/Channel.php:245
msgid "Someone writes a followup comment"
msgstr "Кто-то пишет комментарий"
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:246
msgid "You receive a private message"
msgstr "Вы получили личное сообщение"
-#: ../../Zotlabs/Module/Settings/Channel.php:562
+#: ../../Zotlabs/Module/Settings/Channel.php:247
msgid "You receive a friend suggestion"
msgstr "Вы получили предложение друзей"
-#: ../../Zotlabs/Module/Settings/Channel.php:563
+#: ../../Zotlabs/Module/Settings/Channel.php:248
msgid "You are tagged in a post"
msgstr "Вы были отмечены в публикации"
-#: ../../Zotlabs/Module/Settings/Channel.php:564
+#: ../../Zotlabs/Module/Settings/Channel.php:249
msgid "You are poked/prodded/etc. in a post"
msgstr "Вас толкнули, подтолкнули и т.п. в публикации"
-#: ../../Zotlabs/Module/Settings/Channel.php:566
+#: ../../Zotlabs/Module/Settings/Channel.php:250
msgid "Someone likes your post/comment"
msgstr "Кому-то нравится ваша публикация / комментарий"
-#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Zotlabs/Module/Settings/Channel.php:251
msgid "Show visual notifications including:"
msgstr "Показывать визуальные оповещения включая:"
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:252
msgid "Unseen stream activity"
msgstr "Новая активность в потоке"
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:253
msgid "Unseen channel activity"
msgstr "Новая активность в канале"
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Zotlabs/Module/Settings/Channel.php:254
msgid "Unseen private messages"
msgstr "Новые личные сообщения"
-#: ../../Zotlabs/Module/Settings/Channel.php:573
-#: ../../Zotlabs/Module/Settings/Channel.php:578
-#: ../../Zotlabs/Module/Settings/Channel.php:579
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Zotlabs/Module/Settings/Channel.php:254
+#: ../../Zotlabs/Module/Settings/Channel.php:259
+#: ../../Zotlabs/Module/Settings/Channel.php:260
+#: ../../Zotlabs/Module/Settings/Channel.php:261
msgid "Recommended"
msgstr "Рекомендовано"
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:255
msgid "Upcoming events"
msgstr "Грядущие события"
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:256
msgid "Events today"
msgstr "События сегодня"
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:257
msgid "Upcoming birthdays"
msgstr "Грядущие дни рождения"
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:257
msgid "Not available in all themes"
msgstr "Не доступно во всех темах"
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:258
msgid "System (personal) notifications"
msgstr "Системные (личные) уведомления"
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:259
msgid "System info messages"
msgstr "Сообщения с системной информацией"
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Zotlabs/Module/Settings/Channel.php:260
msgid "System critical alerts"
msgstr "Критические уведомления системы"
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Zotlabs/Module/Settings/Channel.php:261
msgid "New connections"
msgstr "Новые контакты"
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Zotlabs/Module/Settings/Channel.php:262
msgid "System Registrations"
msgstr "Системные регистрации"
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Zotlabs/Module/Settings/Channel.php:263
msgid "Unseen shared files"
msgstr "Новые общие файлы"
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Zotlabs/Module/Settings/Channel.php:264
msgid "Unseen public stream activity"
msgstr "Новая активность в публичном потоке"
-#: ../../Zotlabs/Module/Settings/Channel.php:584
+#: ../../Zotlabs/Module/Settings/Channel.php:265
msgid "Unseen likes and dislikes"
msgstr "Новые лайки и дислайки"
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Zotlabs/Module/Settings/Channel.php:266
msgid "Unseen forum posts"
msgstr "Новые публикации на форуме"
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Zotlabs/Module/Settings/Channel.php:267
msgid "Email notification hub (hostname)"
msgstr "Центр уведомлений по email (имя хоста)"
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Zotlabs/Module/Settings/Channel.php:267
#, php-format
msgid ""
"If your channel is mirrored to multiple hubs, set this to your preferred "
"location. This will prevent duplicate email notifications. Example: %s"
msgstr "Если ваш канал зеркалируется в нескольких местах, это ваше предпочтительное местоположение. Это должно предотвратить дублировать уведомлений по email. Например: %s"
-#: ../../Zotlabs/Module/Settings/Channel.php:587
+#: ../../Zotlabs/Module/Settings/Channel.php:268
msgid "Show new wall posts, private messages and connections under Notices"
msgstr "Показать новые сообщения на стене, личные сообщения и контакты в \"Уведомлениях\""
-#: ../../Zotlabs/Module/Settings/Channel.php:588
+#: ../../Zotlabs/Module/Settings/Channel.php:269
msgid "Mark all notices of the thread read if a notice is clicked"
msgstr "Отметить все уведомления цепочки как прочитанные при нажатии"
-#: ../../Zotlabs/Module/Settings/Channel.php:588
+#: ../../Zotlabs/Module/Settings/Channel.php:269
msgid "If no, only the clicked notice will be marked read"
msgstr "Если выключено, только одно уведомление будет помечено как прочитанное"
-#: ../../Zotlabs/Module/Settings/Channel.php:589
+#: ../../Zotlabs/Module/Settings/Channel.php:270
msgid ""
"Desktop notifications are unavailable because the required browser "
"permission has not been granted"
msgstr "Уведомления на рабочем столе недоступны, поскольку не предоставлено необходимое разрешение от браузера."
-#: ../../Zotlabs/Module/Settings/Channel.php:590
+#: ../../Zotlabs/Module/Settings/Channel.php:271
msgid "Grant permission"
msgstr "Предоставить разрешение"
-#: ../../Zotlabs/Module/Settings/Channel.php:591
+#: ../../Zotlabs/Module/Settings/Channel.php:272
msgid "Notify me of events this many days in advance"
msgstr "Уведомлять меня о событиях заранее, дней"
-#: ../../Zotlabs/Module/Settings/Channel.php:591
+#: ../../Zotlabs/Module/Settings/Channel.php:272
msgid "Must be greater than 0"
msgstr "Должно быть больше 0"
-#: ../../Zotlabs/Module/Settings/Channel.php:596
-msgid "Advanced Account/Page Type Settings"
-msgstr "Дополнительные настройки учётной записи / страницы"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:597
-msgid "Change the behaviour of this account for special situations"
-msgstr "Изменить поведение этого аккаунта в особых ситуациях"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:599
-msgid "Miscellaneous Settings"
-msgstr "Дополнительные настройки"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Zotlabs/Module/Settings/Channel.php:275
msgid "Default photo upload folder"
msgstr "Каталог загрузки фотографий по умолчанию"
-#: ../../Zotlabs/Module/Settings/Channel.php:600
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Zotlabs/Module/Settings/Channel.php:275
+#: ../../Zotlabs/Module/Settings/Channel.php:276
msgid "%Y - current year, %m - current month"
msgstr "%Y - текущий год, %y - текущий месяц"
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Zotlabs/Module/Settings/Channel.php:276
msgid "Default file upload folder"
msgstr "Каталог загрузки файлов по умолчанию"
-#: ../../Zotlabs/Module/Settings/Channel.php:602
+#: ../../Zotlabs/Module/Settings/Channel.php:277
#: ../../Zotlabs/Module/Removeme.php:64
msgid "Remove Channel"
msgstr "Удаление канала"
-#: ../../Zotlabs/Module/Settings/Channel.php:603
+#: ../../Zotlabs/Module/Settings/Channel.php:278
msgid "Remove this channel."
msgstr "Удалить этот канал."
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+msgid "Expire other channel content after this many days"
+msgstr "Храненить содержимое других каналов, дней"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+msgid "0 or blank to use the website limit."
+msgstr "0 или пусто - использовать настройки сайта."
+
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+#, php-format
+msgid "This website expires after %d days."
+msgstr "Срок хранения содержимого этого сайта истекает через %d дней"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+msgid "This website does not expire imported content."
+msgstr "Срок хранения импортированного содержимого этого сайта не ограничен."
+
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+msgid "The website limit takes precedence if lower than your limit."
+msgstr "Ограничение сайта имеет приоритет если ниже вашего значения."
+
#: ../../Zotlabs/Module/Settings/Connections.php:40
msgid "Connections Settings"
msgstr "Настройки контактов"
@@ -5466,6 +5506,274 @@ msgstr "Неверный ответ."
msgid "Response submitted. Updates may not appear instantly."
msgstr "Ответ отправлен. Обновления могут отображаться не сразу."
+#: ../../Zotlabs/Module/Contactedit.php:50
+msgid "Invalid abook_id"
+msgstr "Недействительный abook_id"
+
+#: ../../Zotlabs/Module/Contactedit.php:107
+#: ../../Zotlabs/Module/Connedit.php:101
+msgid "Could not locate selected profile."
+msgstr "Не удалось обнаружить выбранный профиль."
+
+#: ../../Zotlabs/Module/Contactedit.php:192
+#: ../../Zotlabs/Module/Connedit.php:215
+msgid "is now connected to"
+msgstr "теперь подключён к"
+
+#: ../../Zotlabs/Module/Contactedit.php:252
+#: ../../Zotlabs/Module/Contactedit.php:401
+#: ../../Zotlabs/Module/Connedit.php:701
+msgid "Contact Tools"
+msgstr "Инструменты контактов"
+
+#: ../../Zotlabs/Module/Contactedit.php:295
+#: ../../Zotlabs/Module/Connedit.php:579 ../../Zotlabs/Widget/Affinity.php:30
+msgid "Me"
+msgstr "Я"
+
+#: ../../Zotlabs/Module/Contactedit.php:296
+#: ../../Zotlabs/Module/Connedit.php:580 ../../Zotlabs/Widget/Affinity.php:31
+msgid "Family"
+msgstr "Семья"
+
+#: ../../Zotlabs/Module/Contactedit.php:297
+#: ../../Zotlabs/Module/Connedit.php:581 ../../Zotlabs/Widget/Affinity.php:32
+#: ../../include/channel.php:456 ../../include/channel.php:459
+#: ../../include/selectors.php:134
+msgid "Friends"
+msgstr "Друзья"
+
+#: ../../Zotlabs/Module/Contactedit.php:298
+#: ../../Zotlabs/Module/Connedit.php:582 ../../Zotlabs/Widget/Affinity.php:33
+msgid "Acquaintances"
+msgstr "Знакомые"
+
+#: ../../Zotlabs/Module/Contactedit.php:329
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "Approve this contact"
+msgstr "Утвердить этот контакт"
+
+#: ../../Zotlabs/Module/Contactedit.php:329
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "Accept contact to allow communication"
+msgstr "Принять контакт, чтобы разрешить общение"
+
+#: ../../Zotlabs/Module/Contactedit.php:362
+#: ../../Zotlabs/Module/Connedit.php:658 ../../Zotlabs/Module/Tokens.php:269
+msgid "Please select a role for this contact!"
+msgstr "Пожалуйста, выберите роль для этого контакта!"
+
+#: ../../Zotlabs/Module/Contactedit.php:382
+#: ../../Zotlabs/Module/Connedit.php:678
+msgid "This contact is unreachable from this location."
+msgstr "Этот контакт недоступен из этого местоположения."
+
+#: ../../Zotlabs/Module/Contactedit.php:383
+#: ../../Zotlabs/Module/Connedit.php:679
+msgid "This contact may be unreachable from other channel locations."
+msgstr "Этот контакт может быть недоступен из других мест размещения канала."
+
+#: ../../Zotlabs/Module/Contactedit.php:385
+#: ../../Zotlabs/Module/Connedit.php:681
+msgid "Location independence is not supported by their network."
+msgstr "Независимое местоположение не поддерживается их сетью."
+
+#: ../../Zotlabs/Module/Contactedit.php:395
+msgid "View profile"
+msgstr "Просмотреть профиль"
+
+#: ../../Zotlabs/Module/Contactedit.php:408
+msgid "Select a role for this contact"
+msgstr "Выбрать роль для этого контакта"
+
+#: ../../Zotlabs/Module/Contactedit.php:409
+#: ../../Zotlabs/Widget/Permcats.php:80
+msgid "Contact roles"
+msgstr "Роли контакта"
+
+#: ../../Zotlabs/Module/Contactedit.php:420
+#: ../../Zotlabs/Module/Connedit.php:703
+msgid "Slide to adjust your degree of friendship"
+msgstr "Прокрутить для настройки степени дружбы"
+
+#: ../../Zotlabs/Module/Contactedit.php:422
+#: ../../Zotlabs/Module/Connedit.php:705
+msgid "Custom Filter"
+msgstr "Настраиваемый фильтр"
+
+#: ../../Zotlabs/Module/Contactedit.php:423
+#: ../../Zotlabs/Module/Connedit.php:706
+msgid "Only import posts with this text"
+msgstr "Импортировать публикации только с этим текстом"
+
+#: ../../Zotlabs/Module/Contactedit.php:424
+#: ../../Zotlabs/Module/Connedit.php:707
+msgid "Do not import posts with this text"
+msgstr "Не импортировать публикации с этим текстом"
+
+#: ../../Zotlabs/Module/Contactedit.php:429
+#: ../../Zotlabs/Module/Connedit.php:714
+msgid "Approve contact"
+msgstr "Утвердить контакт"
+
+#: ../../Zotlabs/Module/Contactedit.php:431
+#: ../../Zotlabs/Module/Connedit.php:717
+msgid "Their"
+msgstr "Их"
+
+#: ../../Zotlabs/Module/Contactedit.php:432
+#: ../../Zotlabs/Module/Connedit.php:718
+msgid "My"
+msgstr "Мои"
+
+#: ../../Zotlabs/Module/Contactedit.php:449
+msgid "Contact updated"
+msgstr "Контакт обновлён"
+
+#: ../../Zotlabs/Module/Contactedit.php:449
+msgid "Contact update failed"
+msgstr "Обновление контакта не удалось"
+
+#: ../../Zotlabs/Module/Contactedit.php:501
+#: ../../Zotlabs/Module/Contactedit.php:511
+msgid "Refresh succeeded"
+msgstr "Обновление выполнено"
+
+#: ../../Zotlabs/Module/Contactedit.php:504
+msgid "Refresh failed - channel is currently unavailable"
+msgstr "Ошибка обновления - канал в настоящее время недоступен"
+
+#: ../../Zotlabs/Module/Contactedit.php:523
+msgid "Block status updated"
+msgstr "Статус блокировки обновлён"
+
+#: ../../Zotlabs/Module/Contactedit.php:527
+msgid "Block failed"
+msgstr "Блокировка не удалась"
+
+#: ../../Zotlabs/Module/Contactedit.php:538
+msgid "Ignore status updated"
+msgstr "Статус игнорирования обновлён"
+
+#: ../../Zotlabs/Module/Contactedit.php:542
+msgid "Ignore failed"
+msgstr "Игнорирование не удалось"
+
+#: ../../Zotlabs/Module/Contactedit.php:553
+msgid "Archive status updated"
+msgstr "Статус архивации обновлён"
+
+#: ../../Zotlabs/Module/Contactedit.php:557
+msgid "Archive failed"
+msgstr "Архивация не удалась"
+
+#: ../../Zotlabs/Module/Contactedit.php:568
+msgid "Hide status updated"
+msgstr "Статус скрытия обновлён"
+
+#: ../../Zotlabs/Module/Contactedit.php:572
+msgid "Hide failed"
+msgstr "Скрытие не удалось"
+
+#: ../../Zotlabs/Module/Contactedit.php:607
+msgid "Contact removed"
+msgstr "Контакт удалён"
+
+#: ../../Zotlabs/Module/Contactedit.php:611
+msgid "Delete failed"
+msgstr "Не удалось удалить"
+
+#: ../../Zotlabs/Module/Contactedit.php:621
+#: ../../Zotlabs/Module/Connedit.php:487
+msgid "Refresh Permissions"
+msgstr "Обновить разрешения"
+
+#: ../../Zotlabs/Module/Contactedit.php:622
+#: ../../Zotlabs/Module/Connedit.php:490
+msgid "Fetch updated permissions"
+msgstr "Получить обновлённые разрешения"
+
+#: ../../Zotlabs/Module/Contactedit.php:626
+#: ../../Zotlabs/Module/Connedit.php:494
+msgid "Refresh Photo"
+msgstr "Обновить фотографию"
+
+#: ../../Zotlabs/Module/Contactedit.php:627
+#: ../../Zotlabs/Module/Connedit.php:497
+msgid "Fetch updated photo"
+msgstr "Получить обновлённую фотографию"
+
+#: ../../Zotlabs/Module/Contactedit.php:634
+#: ../../Zotlabs/Module/Connedit.php:511
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Блокировать (или разблокировать) связи с этим контактом"
+
+#: ../../Zotlabs/Module/Contactedit.php:635
+#: ../../Zotlabs/Module/Connedit.php:512
+msgid "This connection is blocked!"
+msgstr "Этот контакт заблокирован!"
+
+#: ../../Zotlabs/Module/Contactedit.php:639
+#: ../../Zotlabs/Module/Connedit.php:516
+msgid "Unignore"
+msgstr "Не игнорировать"
+
+#: ../../Zotlabs/Module/Contactedit.php:641
+#: ../../Zotlabs/Module/Connedit.php:519
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Игнорировать (или не игнорировать) все связи для этого контакта"
+
+#: ../../Zotlabs/Module/Contactedit.php:642
+#: ../../Zotlabs/Module/Connedit.php:520
+msgid "This connection is ignored!"
+msgstr "Этот контакт игнорируется!"
+
+#: ../../Zotlabs/Module/Contactedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:524
+msgid "Unarchive"
+msgstr "Разархивировать"
+
+#: ../../Zotlabs/Module/Contactedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:524
+msgid "Archive"
+msgstr "Заархивировать"
+
+#: ../../Zotlabs/Module/Contactedit.php:648
+#: ../../Zotlabs/Module/Connedit.php:527
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое"
+
+#: ../../Zotlabs/Module/Contactedit.php:649
+#: ../../Zotlabs/Module/Connedit.php:528
+msgid "This connection is archived!"
+msgstr "Этот контакт заархивирован!"
+
+#: ../../Zotlabs/Module/Contactedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:532
+msgid "Unhide"
+msgstr "Показать"
+
+#: ../../Zotlabs/Module/Contactedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:532
+msgid "Hide"
+msgstr "Скрыть"
+
+#: ../../Zotlabs/Module/Contactedit.php:655
+#: ../../Zotlabs/Module/Connedit.php:535
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Скрыть или показать этот контакт от / для остальных"
+
+#: ../../Zotlabs/Module/Contactedit.php:656
+#: ../../Zotlabs/Module/Connedit.php:536
+msgid "This connection is hidden!"
+msgstr "Этот контакт скрыт!"
+
+#: ../../Zotlabs/Module/Contactedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:543
+msgid "Delete this connection"
+msgstr "Удалить этот контакт"
+
#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:65
msgid "Location not found."
msgstr "Местоположение не найдено"
@@ -5533,7 +5841,7 @@ msgstr "не установлено"
msgid "Register is closed"
msgstr "Регистрация закрыта"
-#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:548
+#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549
msgid "Note, the invitation code is valid up to"
msgstr "Обратите внимание: код приглашения действителен до "
@@ -5546,11 +5854,6 @@ msgstr "Слишком много получателей для одного к
msgid "No recipients for this invitation"
msgstr "Нет получателей для этого приглашения"
-#: ../../Zotlabs/Module/Invite.php:133
-#, php-format
-msgid "(%s) : Not a valid email address"
-msgstr "(%s) : Недействительный адрес электронной почты"
-
#: ../../Zotlabs/Module/Invite.php:138
#, php-format
msgid "(%s) : Not a real email address"
@@ -5571,8 +5874,8 @@ msgstr "(%s) : Адрес электронной почты уже исполь
msgid "(%s) : Accepted email address"
msgstr "%s) : Подтверждённый адрес электронной почты"
-#: ../../Zotlabs/Module/Invite.php:225 ../../Zotlabs/Module/Invite.php:493
-#: ../../Zotlabs/Module/Invite.php:507 ../../Zotlabs/Module/Home.php:87
+#: ../../Zotlabs/Module/Invite.php:225 ../../Zotlabs/Module/Invite.php:494
+#: ../../Zotlabs/Module/Invite.php:508 ../../Zotlabs/Module/Home.php:87
#: ../../Zotlabs/Module/Home.php:95 ../../Zotlabs/Lib/Enotify.php:66
#: ../../extend/addon/hzaddons/opensearch/opensearch.php:42
msgid "$Projectname"
@@ -5622,44 +5925,44 @@ msgstr "Превышен лимит приглашений для всех по
msgid "Invitation expires after"
msgstr "Приглашение истекает после"
-#: ../../Zotlabs/Module/Invite.php:503 ../../Zotlabs/Module/Invite.php:542
+#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543
msgid "Invitation"
msgstr "Приглашение"
-#: ../../Zotlabs/Module/Invite.php:533
+#: ../../Zotlabs/Module/Invite.php:534
msgid "Send invitations"
msgstr "Отправить приглашение"
-#: ../../Zotlabs/Module/Invite.php:534
+#: ../../Zotlabs/Module/Invite.php:535
msgid "Invitations I am using"
msgstr "Приглашения, которые я использую"
-#: ../../Zotlabs/Module/Invite.php:535
+#: ../../Zotlabs/Module/Invite.php:536
msgid "Invitations we are using"
msgstr "Приглашения, которые мы используем"
-#: ../../Zotlabs/Module/Invite.php:536
+#: ../../Zotlabs/Module/Invite.php:537
msgid "§ Note, the email(s) sent will be recorded in the system logs"
msgstr "Внимание: адреса электронной почты будут записаны в системные журналы."
-#: ../../Zotlabs/Module/Invite.php:537
+#: ../../Zotlabs/Module/Invite.php:538
msgid "Enter email addresses, one per line:"
msgstr "Введите адреса электронной почты, по одному в строке:"
-#: ../../Zotlabs/Module/Invite.php:538
+#: ../../Zotlabs/Module/Invite.php:539
msgid "Your message:"
msgstr "Сообщение:"
-#: ../../Zotlabs/Module/Invite.php:539
+#: ../../Zotlabs/Module/Invite.php:540
msgid "Invite template"
msgstr "Шаблон приглашения"
-#: ../../Zotlabs/Module/Invite.php:541
+#: ../../Zotlabs/Module/Invite.php:542
#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:198
msgid "Subject:"
msgstr "Тема:"
-#: ../../Zotlabs/Module/Invite.php:547
+#: ../../Zotlabs/Module/Invite.php:548
msgid "Here you may enter personal notes to the recipient(s)"
msgstr "Здесь вы можете ввести личные заметки для получателей"
@@ -5668,30 +5971,30 @@ msgstr "Здесь вы можете ввести личные заметки д
msgid "Cover Photos"
msgstr "Фотографии обложки"
-#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4630
+#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4762
msgid "female"
msgstr "женщина"
-#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4631
+#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4763
#, php-format
msgid "%1$s updated her %2$s"
msgstr "%1$s обновила её %2$s"
-#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4632
+#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4764
msgid "male"
msgstr "мужчина"
-#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4633
+#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4765
#, php-format
msgid "%1$s updated his %2$s"
msgstr "%1$s обновил его %2$s"
-#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4635
+#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4767
#, php-format
msgid "%1$s updated their %2$s"
msgstr "%2$s %1$s обновлена"
-#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2286
+#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2335
msgid "cover photo"
msgstr "фотография обложки"
@@ -5703,23 +6006,23 @@ msgstr "Фотография вашей обложки может быть ви
msgid "Change Cover Photo"
msgstr "Изменить фотографию обложки"
-#: ../../Zotlabs/Module/Network.php:107
+#: ../../Zotlabs/Module/Network.php:106
msgid "No such group"
msgstr "Нет такой группы"
-#: ../../Zotlabs/Module/Network.php:156
+#: ../../Zotlabs/Module/Network.php:155
msgid "No such channel"
msgstr "Нет такого канала"
-#: ../../Zotlabs/Module/Network.php:243
+#: ../../Zotlabs/Module/Network.php:242
msgid "Privacy group is empty"
msgstr "Группа конфиденциальности пуста"
-#: ../../Zotlabs/Module/Network.php:253
+#: ../../Zotlabs/Module/Network.php:252
msgid "Privacy group: "
msgstr "Группа конфиденциальности: "
-#: ../../Zotlabs/Module/Network.php:326
+#: ../../Zotlabs/Module/Network.php:325
#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:29
msgid "Invalid channel."
msgstr "Недействительный канал."
@@ -5825,7 +6128,7 @@ msgstr "Введите название каталога"
msgid "or select an existing folder (doubleclick)"
msgstr "или выберите существующий каталог (двойной щелчок)"
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:208
msgid "Save to Folder"
msgstr "Сохранить в каталог"
@@ -5849,94 +6152,94 @@ msgstr "Создать пользовательское приложение"
msgid "Connection added."
msgstr "Контакт добавлен."
-#: ../../Zotlabs/Module/Like.php:106
+#: ../../Zotlabs/Module/Like.php:112
msgid "Like/Dislike"
msgstr "Нравится / не нравится"
-#: ../../Zotlabs/Module/Like.php:112
+#: ../../Zotlabs/Module/Like.php:118
msgid "This action is restricted to members."
msgstr "Это действие доступно только участникам."
-#: ../../Zotlabs/Module/Like.php:113
+#: ../../Zotlabs/Module/Like.php:119
msgid ""
"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
"\"register\">register as a new $Projectname member</a> to continue."
msgstr "Пожалуйста, для продолжения <a href=\"rmagic\"> войдите с вашим $Projectname ID</a> или <a href=\"register\">зарегистрируйтесь как новый участник $Projectname</a>."
-#: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192
-#: ../../Zotlabs/Module/Like.php:230
+#: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198
+#: ../../Zotlabs/Module/Like.php:236
msgid "Invalid request."
msgstr "Неверный запрос."
-#: ../../Zotlabs/Module/Like.php:178 ../../include/conversation.php:135
+#: ../../Zotlabs/Module/Like.php:184 ../../include/conversation.php:135
msgid "channel"
msgstr "канал"
-#: ../../Zotlabs/Module/Like.php:207
+#: ../../Zotlabs/Module/Like.php:213
msgid "thing"
msgstr "предмет"
-#: ../../Zotlabs/Module/Like.php:253
+#: ../../Zotlabs/Module/Like.php:259
msgid "Channel unavailable."
msgstr "Канал недоступен."
-#: ../../Zotlabs/Module/Like.php:289
+#: ../../Zotlabs/Module/Like.php:295
msgid "Previous action reversed."
msgstr "Предыдущее действие отменено."
-#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3339
+#: ../../Zotlabs/Module/Like.php:477 ../../Zotlabs/Lib/Activity.php:3422
#: ../../include/conversation.php:174
-#: ../../extend/addon/hzaddons/pubcrawl/as.php:1977
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1978
#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1572
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s нравится %3$s %2$s"
-#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3341
+#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3424
#: ../../include/conversation.php:177
-#: ../../extend/addon/hzaddons/pubcrawl/as.php:1979
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1980
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s не нравится %2$s %3$s"
-#: ../../Zotlabs/Module/Like.php:475
+#: ../../Zotlabs/Module/Like.php:481
#, php-format
msgid "%1$s agrees with %2$s's %3$s"
msgstr "%1$s согласен с %2$s %3$s"
-#: ../../Zotlabs/Module/Like.php:477
+#: ../../Zotlabs/Module/Like.php:483
#, php-format
msgid "%1$s doesn't agree with %2$s's %3$s"
msgstr "%1$s не согласен с %2$s %3$s"
-#: ../../Zotlabs/Module/Like.php:479
+#: ../../Zotlabs/Module/Like.php:485
#, php-format
msgid "%1$s abstains from a decision on %2$s's %3$s"
msgstr "%1$s воздерживается от решения по %2$s%3$s"
-#: ../../Zotlabs/Module/Like.php:481
+#: ../../Zotlabs/Module/Like.php:487
#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2205
#, php-format
msgid "%1$s is attending %2$s's %3$s"
msgstr "%1$s посещает %2$s%3$s"
-#: ../../Zotlabs/Module/Like.php:483
+#: ../../Zotlabs/Module/Like.php:489
#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2207
#, php-format
msgid "%1$s is not attending %2$s's %3$s"
msgstr "%1$s не посещает %2$s%3$s"
-#: ../../Zotlabs/Module/Like.php:485
+#: ../../Zotlabs/Module/Like.php:491
#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2209
#, php-format
msgid "%1$s may attend %2$s's %3$s"
msgstr "%1$s может посетить %2$s%3$s"
-#: ../../Zotlabs/Module/Like.php:586
+#: ../../Zotlabs/Module/Like.php:592
msgid "Action completed."
msgstr "Действие завершено."
-#: ../../Zotlabs/Module/Like.php:587
+#: ../../Zotlabs/Module/Like.php:593
msgid "Thank you."
msgstr "Спасибо."
@@ -5983,16 +6286,6 @@ msgstr "Разрешённые символы a-z 0-9, - и _"
msgid "Channel name"
msgstr "Название канала"
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid ""
-"Select a channel permission role compatible with your usage needs and "
-"privacy requirements."
-msgstr "Выберите разрешения для канала в соответствии с вашими потребностями и требованиями безопасности."
-
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid "Read more about channel permission roles"
-msgstr "Прочитать больше о разрешениях для каналов"
-
#: ../../Zotlabs/Module/New_channel.php:181
msgid "Create a Channel"
msgstr "Создать канал"
@@ -6018,7 +6311,7 @@ msgid "Add Card"
msgstr "Добавить карточку"
#: ../../Zotlabs/Module/Cards.php:205 ../../Zotlabs/Lib/Apps.php:332
-#: ../../include/nav.php:506
+#: ../../include/nav.php:504
msgid "Cards"
msgstr "Карточки"
@@ -6058,7 +6351,7 @@ msgstr "Меню может использоваться, чтобы сохра
msgid "Submit and proceed"
msgstr "Отправить и обработать"
-#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2689
+#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2717
msgid "Menus"
msgstr "Меню"
@@ -6119,12 +6412,12 @@ msgstr "Разрешить закладки"
msgid "Public Stream"
msgstr "Публичный поток"
-#: ../../Zotlabs/Module/Search.php:249
+#: ../../Zotlabs/Module/Search.php:239
#, php-format
msgid "Items tagged with: %s"
msgstr "Объекты помечены как: %s"
-#: ../../Zotlabs/Module/Search.php:251
+#: ../../Zotlabs/Module/Search.php:241
#, php-format
msgid "Search results for: %s"
msgstr "Результаты поиска для: %s"
@@ -6302,7 +6595,7 @@ msgid "Export selected"
msgstr "Экспортировать выбранное"
#: ../../Zotlabs/Module/Webpages.php:249 ../../Zotlabs/Lib/Apps.php:347
-#: ../../include/nav.php:529
+#: ../../include/nav.php:527
msgid "Webpages"
msgstr "Веб-страницы"
@@ -6350,11 +6643,11 @@ msgstr "Комментарий удалён"
msgid "Authentication failed."
msgstr "Ошибка аутентификации."
-#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2562
+#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2611
msgid "Enter your channel address (e.g. channel@example.com)"
msgstr "Введите адрес вашего канала (например: channel@example.com)"
-#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2563
+#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2612
msgid "Authenticate"
msgstr "Проверка подлинности"
@@ -6362,51 +6655,65 @@ msgstr "Проверка подлинности"
msgid "Permissions denied."
msgstr "Доступ запрещен."
-#: ../../Zotlabs/Module/Import.php:165
+#: ../../Zotlabs/Module/Import.php:70
+msgid "Nothing to import."
+msgstr "Ничего импортировать."
+
+#: ../../Zotlabs/Module/Import.php:86 ../../Zotlabs/Module/Import.php:100
+msgid "Unable to download data from old server"
+msgstr "Невозможно загрузить данные со старого сервера"
+
+#: ../../Zotlabs/Module/Import.php:163
#, php-format
msgid "Your service plan only allows %d channels."
msgstr "Ваш класс обслуживания разрешает только %d каналов."
-#: ../../Zotlabs/Module/Import.php:191
+#: ../../Zotlabs/Module/Import.php:190
msgid "No channel. Import failed."
msgstr "Канала нет. Импорт невозможен."
-#: ../../Zotlabs/Module/Import.php:576
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"Automatic content and files import was not possible due to API version "
+"incompatiblity. Please import content and files manually!"
+msgstr "Автоматический импорт содержимого и файлов был невозможен из-за несовместимости версий API. Пожалуйста, импортируйте контент и файлы вручную!"
+
+#: ../../Zotlabs/Module/Import.php:585
msgid "You must be logged in to use this feature."
msgstr "Вы должны войти в систему, чтобы использовать эту функцию."
-#: ../../Zotlabs/Module/Import.php:583
+#: ../../Zotlabs/Module/Import.php:592
msgid "Channel Import"
msgstr "Импортировать канал"
-#: ../../Zotlabs/Module/Import.php:584
+#: ../../Zotlabs/Module/Import.php:593
msgid ""
"Use this form to import an existing channel from a different server/hub. You "
"may retrieve the channel identity from the old server/hub via the network or "
"provide an export file."
msgstr "Используйте эту форм для импорта существующего канала с другого сервера / хаба. Вы можете получить идентификационные данные канала со старого сервера / хаба через сеть или предоставить файл экспорта."
-#: ../../Zotlabs/Module/Import.php:586
+#: ../../Zotlabs/Module/Import.php:595
msgid "Or provide the old server/hub details"
msgstr "или предоставьте данные старого сервера"
-#: ../../Zotlabs/Module/Import.php:588
+#: ../../Zotlabs/Module/Import.php:597
msgid "Your old identity address (xyz@example.com)"
msgstr "Ваш старый адрес канала (xyz@example.com)"
-#: ../../Zotlabs/Module/Import.php:589
+#: ../../Zotlabs/Module/Import.php:598
msgid "Your old login email address"
msgstr "Ваш старый адрес электронной почты"
-#: ../../Zotlabs/Module/Import.php:590
+#: ../../Zotlabs/Module/Import.php:599
msgid "Your old login password"
msgstr "Ваш старый пароль"
-#: ../../Zotlabs/Module/Import.php:591
+#: ../../Zotlabs/Module/Import.php:600
msgid "Import your items and files (limited by available memory)"
msgstr "Импортировать ваши запиши и файлы (ограничено объёмом доступной памяти)"
-#: ../../Zotlabs/Module/Import.php:593
+#: ../../Zotlabs/Module/Import.php:602
msgid ""
"For either option, please choose whether to make this hub your new primary "
"address, or whether your old location should continue this role. You will be "
@@ -6414,96 +6721,104 @@ msgid ""
"location for files, photos, and media."
msgstr "Для любого варианта, пожалуйста, выберите, следует ли сделать этот хаб вашим новым основным адресом, или ваше прежнее местоположение должно продолжить выполнять эту роль. Вы сможете отправлять сообщения из любого местоположения, но только одно может быть помечено как основное место для файлов, фотографий и мультимедиа."
-#: ../../Zotlabs/Module/Import.php:595
+#: ../../Zotlabs/Module/Import.php:604
msgid "Make this hub my primary location"
msgstr "Сделать этот хаб главным"
-#: ../../Zotlabs/Module/Import.php:596
+#: ../../Zotlabs/Module/Import.php:605
msgid "Move this channel (disable all previous locations)"
msgstr "Переместить это канал (отключить все предыдущие месторасположения)"
-#: ../../Zotlabs/Module/Import.php:597
+#: ../../Zotlabs/Module/Import.php:606
msgid "Use this channel nickname instead of the one provided"
msgstr "Использовать псевдоним этого канала вместо предоставленного"
-#: ../../Zotlabs/Module/Import.php:597
+#: ../../Zotlabs/Module/Import.php:606
msgid ""
"Leave blank to keep your existing channel nickname. You will be randomly "
"assigned a similar nickname if either name is already allocated on this site."
msgstr "Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным образом назначен похожий псевдоним если такое имя уже выделено на этом сайте."
-#: ../../Zotlabs/Module/Import.php:599
+#: ../../Zotlabs/Module/Import.php:608
msgid ""
"This process may take several minutes to complete. Please submit the form "
"only once and leave this page open until finished."
msgstr "Процесс может занять несколько минут. Пожалуйста, отправьте форму только один раз и оставьте эту страницу открытой до завершения."
-#: ../../Zotlabs/Module/Group.php:46
+#: ../../Zotlabs/Module/Group.php:47
msgid "Privacy group created."
msgstr "Группа конфиденциальности создана."
-#: ../../Zotlabs/Module/Group.php:49
+#: ../../Zotlabs/Module/Group.php:50
msgid "Could not create privacy group."
msgstr "Не удалось создать группу конфиденциальности."
-#: ../../Zotlabs/Module/Group.php:62 ../../Zotlabs/Module/Group.php:212
-#: ../../include/items.php:4249
+#: ../../Zotlabs/Module/Group.php:62 ../../Zotlabs/Module/Group.php:232
+#: ../../include/items.php:4381
msgid "Privacy group not found."
msgstr "Группа конфиденциальности не найдена."
-#: ../../Zotlabs/Module/Group.php:81
+#: ../../Zotlabs/Module/Group.php:82
msgid "Privacy group updated."
msgstr "Группа конфиденциальности обновлена."
-#: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:152
-#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:370
+#: ../../Zotlabs/Module/Group.php:151 ../../Zotlabs/Module/Group.php:330
+msgid "Post to this group by default"
+msgstr "Публиковать в этой группе по умолчанию"
+
+#: ../../Zotlabs/Module/Group.php:152 ../../Zotlabs/Module/Group.php:331
+msgid "Add new contacts to this group by default"
+msgstr "Добавлять новые контакты в эту группу по умолчанию"
+
+#: ../../Zotlabs/Module/Group.php:157 ../../Zotlabs/Module/Group.php:171
+#: ../../Zotlabs/Lib/Apps.php:370 ../../Zotlabs/Lib/AccessList.php:349
#: ../../Zotlabs/Widget/Activity_filter.php:88 ../../include/group.php:327
-#: ../../include/nav.php:101 ../../include/acl_selectors.php:87
+#: ../../include/acl_selectors.php:87
msgid "Privacy Groups"
msgstr "Группы конфиденциальности"
-#: ../../Zotlabs/Module/Group.php:141
+#: ../../Zotlabs/Module/Group.php:158
msgid "Add Group"
msgstr "Добавить группу"
-#: ../../Zotlabs/Module/Group.php:145
+#: ../../Zotlabs/Module/Group.php:162
msgid "Privacy group name"
msgstr "Имя группы конфиденциальности"
-#: ../../Zotlabs/Module/Group.php:146 ../../Zotlabs/Module/Group.php:255
+#: ../../Zotlabs/Module/Group.php:163 ../../Zotlabs/Module/Group.php:275
msgid "Members are visible to other channels"
msgstr "Участники канала видимые для остальных"
-#: ../../Zotlabs/Module/Group.php:181
+#: ../../Zotlabs/Module/Group.php:201
msgid "Privacy group removed."
msgstr "Группа конфиденциальности удалена."
-#: ../../Zotlabs/Module/Group.php:184
+#: ../../Zotlabs/Module/Group.php:204
msgid "Unable to remove privacy group."
msgstr "Ну удалось удалить группу конфиденциальности."
-#: ../../Zotlabs/Module/Group.php:250
+#: ../../Zotlabs/Module/Group.php:270
#, php-format
msgid "Privacy Group: %s"
msgstr "Группа конфиденциальности: %s"
-#: ../../Zotlabs/Module/Group.php:252
+#: ../../Zotlabs/Module/Group.php:272
msgid "Privacy group name: "
msgstr "Название группы конфиденциальности: "
-#: ../../Zotlabs/Module/Group.php:257
+#: ../../Zotlabs/Module/Group.php:277
msgid "Delete Group"
msgstr "Удалить группу"
-#: ../../Zotlabs/Module/Group.php:268
+#: ../../Zotlabs/Module/Group.php:288
msgid "Group members"
msgstr "Члены группы"
-#: ../../Zotlabs/Module/Group.php:270
+#: ../../Zotlabs/Module/Group.php:290
msgid "Not in this group"
msgstr "Не в этой группе"
-#: ../../Zotlabs/Module/Group.php:302
+#: ../../Zotlabs/Module/Group.php:322
msgid "Click a channel to toggle membership"
msgstr "Нажмите на канал для просмотра членства"
@@ -6511,279 +6826,123 @@ msgstr "Нажмите на канал для просмотра членств
msgid "vcard"
msgstr "vCard"
-#: ../../Zotlabs/Module/Connedit.php:121
-msgid "Could not locate selected profile."
-msgstr "Не удалось обнаружить выбранный профиль."
-
-#: ../../Zotlabs/Module/Connedit.php:262
+#: ../../Zotlabs/Module/Connedit.php:171
msgid "Connection updated."
msgstr "Контакты обновлены."
-#: ../../Zotlabs/Module/Connedit.php:264
+#: ../../Zotlabs/Module/Connedit.php:173
msgid "Failed to update connection record."
msgstr "Не удалось обновить запись контакта."
-#: ../../Zotlabs/Module/Connedit.php:307
-msgid "is now connected to"
-msgstr "теперь подключён к"
-
-#: ../../Zotlabs/Module/Connedit.php:432
+#: ../../Zotlabs/Module/Connedit.php:320
msgid "Could not access address book record."
msgstr "Не удалось получить доступ к записи адресной книги."
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:368
msgid "Refresh failed - channel is currently unavailable."
msgstr "Обновление невозможно - в настоящее время канал недоступен."
-#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
-#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
-#: ../../Zotlabs/Module/Connedit.php:534
+#: ../../Zotlabs/Module/Connedit.php:382 ../../Zotlabs/Module/Connedit.php:391
+#: ../../Zotlabs/Module/Connedit.php:400 ../../Zotlabs/Module/Connedit.php:409
+#: ../../Zotlabs/Module/Connedit.php:422
msgid "Unable to set address book parameters."
msgstr "Не удалось получить доступ к параметрам адресной книги."
-#: ../../Zotlabs/Module/Connedit.php:553
+#: ../../Zotlabs/Module/Connedit.php:441
msgid "Connection has been removed."
msgstr "Контакт был удалён."
-#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:350
-#: ../../include/nav.php:112 ../../include/conversation.php:1086
+#: ../../Zotlabs/Module/Connedit.php:480 ../../Zotlabs/Lib/Apps.php:350
+#: ../../include/nav.php:110 ../../include/conversation.php:1086
#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:58
msgid "View Profile"
msgstr "Просмотреть профиль"
-#: ../../Zotlabs/Module/Connedit.php:596
+#: ../../Zotlabs/Module/Connedit.php:483
#, php-format
msgid "View %s's profile"
msgstr "Просмотр %s профиля"
-#: ../../Zotlabs/Module/Connedit.php:600
-msgid "Refresh Permissions"
-msgstr "Обновить разрешения"
-
-#: ../../Zotlabs/Module/Connedit.php:603
-msgid "Fetch updated permissions"
-msgstr "Получить обновлённые разрешения"
-
-#: ../../Zotlabs/Module/Connedit.php:607
-msgid "Refresh Photo"
-msgstr "Обновить фотографию"
-
-#: ../../Zotlabs/Module/Connedit.php:610
-msgid "Fetch updated photo"
-msgstr "Получить обновлённую фотографию"
-
-#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1096
+#: ../../Zotlabs/Module/Connedit.php:501 ../../include/conversation.php:1098
msgid "Recent Activity"
msgstr "Последние действия"
-#: ../../Zotlabs/Module/Connedit.php:617
+#: ../../Zotlabs/Module/Connedit.php:504
msgid "View recent posts and comments"
msgstr "Просмотреть последние публикации и комментарии"
-#: ../../Zotlabs/Module/Connedit.php:624
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Блокировать (или разблокировать) связи с этим контактом"
-
-#: ../../Zotlabs/Module/Connedit.php:625
-msgid "This connection is blocked!"
-msgstr "Этот контакт заблокирован!"
-
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Unignore"
-msgstr "Не игнорировать"
-
-#: ../../Zotlabs/Module/Connedit.php:632
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Игнорировать (или не игнорировать) все связи для этого контакта"
-
-#: ../../Zotlabs/Module/Connedit.php:633
-msgid "This connection is ignored!"
-msgstr "Этот контакт игнорируется!"
-
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Unarchive"
-msgstr "Разархивировать"
-
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Archive"
-msgstr "Заархивировать"
-
-#: ../../Zotlabs/Module/Connedit.php:640
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое"
-
-#: ../../Zotlabs/Module/Connedit.php:641
-msgid "This connection is archived!"
-msgstr "Этот контакт заархивирован!"
-
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Unhide"
-msgstr "Показать"
-
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Hide"
-msgstr "Скрыть"
-
-#: ../../Zotlabs/Module/Connedit.php:648
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Скрыть или показать этот контакт от / для остальных"
-
-#: ../../Zotlabs/Module/Connedit.php:649
-msgid "This connection is hidden!"
-msgstr "Этот контакт скрыт!"
-
-#: ../../Zotlabs/Module/Connedit.php:656
-msgid "Delete this connection"
-msgstr "Удалить этот контакт"
-
-#: ../../Zotlabs/Module/Connedit.php:664
+#: ../../Zotlabs/Module/Connedit.php:550
msgid "Fetch Vcard"
msgstr "Получить vCard"
-#: ../../Zotlabs/Module/Connedit.php:667
+#: ../../Zotlabs/Module/Connedit.php:553
msgid "Fetch electronic calling card for this connection"
msgstr "Получить электронную телефонную карточку для этого контакта"
-#: ../../Zotlabs/Module/Connedit.php:678
-msgid "Open Individual Permissions section by default"
-msgstr "Открывать раздел \"Индивидуальные разрешения\" по умолчанию"
-
-#: ../../Zotlabs/Module/Connedit.php:701
+#: ../../Zotlabs/Module/Connedit.php:572
msgid "Affinity"
msgstr "Сходство"
-#: ../../Zotlabs/Module/Connedit.php:704
+#: ../../Zotlabs/Module/Connedit.php:575
msgid "Open Set Affinity section by default"
msgstr "Открыть секцию установления сходства по умолчанию"
-#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:30
-msgid "Me"
-msgstr "Я"
-
-#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:31
-msgid "Family"
-msgstr "Семья"
-
-#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:33
-msgid "Acquaintances"
-msgstr "Знакомые"
-
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Zotlabs/Module/Connedit.php:612
msgid "Filter"
msgstr "Фильтр"
-#: ../../Zotlabs/Module/Connedit.php:744
+#: ../../Zotlabs/Module/Connedit.php:615
msgid "Open Custom Filter section by default"
msgstr "Открывать секцию \"Настраиваемый фильтр\" по умолчанию"
-#: ../../Zotlabs/Module/Connedit.php:781
-msgid "Approve this connection"
-msgstr "Утвердить этот контакт"
-
-#: ../../Zotlabs/Module/Connedit.php:781
-msgid "Accept connection to allow communication"
-msgstr "Принять контакт чтобы разрешить связь"
-
-#: ../../Zotlabs/Module/Connedit.php:786
+#: ../../Zotlabs/Module/Connedit.php:626
msgid "Set Affinity"
msgstr "Установить сходство"
-#: ../../Zotlabs/Module/Connedit.php:789
+#: ../../Zotlabs/Module/Connedit.php:629
msgid "Set Profile"
msgstr "Установить профиль"
-#: ../../Zotlabs/Module/Connedit.php:792
+#: ../../Zotlabs/Module/Connedit.php:632
msgid "Set Affinity & Profile"
msgstr "Установить сходство и профиль"
-#: ../../Zotlabs/Module/Connedit.php:840
-msgid "This connection is unreachable from this location."
-msgstr "Этот контакт недоступен для данного местоположения"
-
-#: ../../Zotlabs/Module/Connedit.php:841
-msgid "This connection may be unreachable from other channel locations."
-msgstr "Этот контакт может быть недоступен из других мест размещения канала"
-
-#: ../../Zotlabs/Module/Connedit.php:843
-msgid "Location independence is not supported by their network."
-msgstr "Независимое местоположение не поддерживается их сетью."
-
-#: ../../Zotlabs/Module/Connedit.php:849
-msgid ""
-"This connection is unreachable from this location. Location independence is "
-"not supported by their network."
-msgstr "Этот контакт недоступен из данного местоположения. Независимое местоположение не поддерживается их сетью."
-
-#: ../../Zotlabs/Module/Connedit.php:852 ../../include/items.php:4282
+#: ../../Zotlabs/Module/Connedit.php:685
#, php-format
-msgid "Connection: %s"
+msgid "Contact: %s"
msgstr "Контакт: %s"
-#: ../../Zotlabs/Module/Connedit.php:853
-msgid "Connection requests will be approved without your interaction"
-msgstr "Запросы контактов будут одобрены без вашего участия"
+#: ../../Zotlabs/Module/Connedit.php:687
+msgid "Manage contact roles"
+msgstr "Управление ролями контактов"
-#: ../../Zotlabs/Module/Connedit.php:862
-msgid "This connection's primary address is"
-msgstr "Главный адрес это контакта"
+#: ../../Zotlabs/Module/Connedit.php:694
+msgid "This contacts's primary address is"
+msgstr "Основной адрес этого контакта:"
-#: ../../Zotlabs/Module/Connedit.php:863
+#: ../../Zotlabs/Module/Connedit.php:695
msgid "Available locations:"
msgstr "Доступные расположения:"
-#: ../../Zotlabs/Module/Connedit.php:869
-msgid "Connection Tools"
-msgstr "Инструменты контактов"
-
-#: ../../Zotlabs/Module/Connedit.php:871
-msgid "Slide to adjust your degree of friendship"
-msgstr "Прокрутить для настройки степени дружбы"
-
-#: ../../Zotlabs/Module/Connedit.php:872 ../../include/js_strings.php:20
-msgid "Rating"
-msgstr "Оценка"
-
-#: ../../Zotlabs/Module/Connedit.php:873
-msgid "Slide to adjust your rating"
-msgstr "Прокрутить для настройки оценки"
-
-#: ../../Zotlabs/Module/Connedit.php:874 ../../Zotlabs/Module/Connedit.php:879
-msgid "Optionally explain your rating"
-msgstr "Объясните свою оценку (не обязательно)"
-
-#: ../../Zotlabs/Module/Connedit.php:876
-msgid "Custom Filter"
-msgstr "Настраиваемый фильтр"
-
-#: ../../Zotlabs/Module/Connedit.php:877
-msgid "Only import posts with this text"
-msgstr "Импортировать публикации только с этим текстом"
-
-#: ../../Zotlabs/Module/Connedit.php:878
-msgid "Do not import posts with this text"
-msgstr "Не импортировать публикации с этим текстом"
-
-#: ../../Zotlabs/Module/Connedit.php:880
-msgid "This information is public!"
-msgstr "Эта информация общедоступна!"
-
-#: ../../Zotlabs/Module/Connedit.php:885
-msgid "Connection Pending Approval"
-msgstr "Ожидающие подтверждения контактов"
+#: ../../Zotlabs/Module/Connedit.php:710
+msgid "Contact Pending Approval"
+msgstr "Контакты ожидающие утверждения"
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Zotlabs/Module/Connedit.php:715
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Пожалуйста, выберите профиль который вы хотит показывать в %s при безопасном просмотре."
-#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Tokens.php:178
-msgid "Their Settings"
-msgstr "Их настройки"
+#: ../../Zotlabs/Module/Connedit.php:721
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
+msgstr "Некоторые разрешения могут наследовать из <a href=\"settings\"><strong>настроек приватности</strong></a> ваших каналов которые могут иметь более высокий приоритет чем индивидуальные. Вы <strong>не можете</strong> менять эти настройки здесь."
-#: ../../Zotlabs/Module/Connedit.php:897
+#: ../../Zotlabs/Module/Connedit.php:722
msgid ""
"Some permissions may be inherited from your channel's <a href=\"settings"
"\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -6791,11 +6950,11 @@ msgid ""
"any impact unless the inherited setting changes."
msgstr "Некоторые разрешения могут быть унаследованы из <a href=\"settings\"><strong>настроек приватности</strong></a> вашего канала, которые могут иметь более высокий приоритет чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения переданных по наследству настроек."
-#: ../../Zotlabs/Module/Connedit.php:898
+#: ../../Zotlabs/Module/Connedit.php:723
msgid "Last update:"
msgstr "Последнее обновление:"
-#: ../../Zotlabs/Module/Connedit.php:906
+#: ../../Zotlabs/Module/Connedit.php:731
msgid "Details"
msgstr "Сведения"
@@ -6881,7 +7040,7 @@ msgid "Add Article"
msgstr "Добавить статью"
#: ../../Zotlabs/Module/Articles.php:223 ../../Zotlabs/Lib/Apps.php:331
-#: ../../include/nav.php:517
+#: ../../include/nav.php:515
msgid "Articles"
msgstr "Статьи"
@@ -7374,6 +7533,10 @@ msgstr "Невозможно добавить элемент меню."
msgid "Menu Item Permissions"
msgstr "Разрешения на пункт меню"
+#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
+msgid "(click to open/close)"
+msgstr "(нажмите чтобы открыть/закрыть)"
+
#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
msgid "Link Name"
msgstr "Имя ссылки"
@@ -7503,7 +7666,7 @@ msgstr "Статистика"
msgid "Software"
msgstr "Программное обеспечение"
-#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1136
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1146
msgid "Ratings"
msgstr "Оценки"
@@ -7645,7 +7808,7 @@ msgid "NEW"
msgstr "НОВОЕ"
#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1541
+#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1538
msgid "Size"
msgstr "Размер"
@@ -7726,12 +7889,12 @@ msgstr "Статус:"
msgid "Homepage: "
msgstr "Домашняя страница:"
-#: ../../Zotlabs/Module/Directory.php:348 ../../include/channel.php:1764
+#: ../../Zotlabs/Module/Directory.php:348 ../../include/channel.php:1799
msgid "Age:"
msgstr "Возраст:"
#: ../../Zotlabs/Module/Directory.php:353 ../../include/event.php:63
-#: ../../include/event.php:134 ../../include/channel.php:1591
+#: ../../include/event.php:134 ../../include/channel.php:1625
msgid "Location:"
msgstr "Местоположение:"
@@ -7739,11 +7902,12 @@ msgstr "Местоположение:"
msgid "Description:"
msgstr "Описание:"
-#: ../../Zotlabs/Module/Directory.php:366 ../../include/channel.php:1793
+#: ../../Zotlabs/Module/Directory.php:366 ../../include/channel.php:1632
+#: ../../include/channel.php:1828
msgid "Hometown:"
msgstr "Родной город:"
-#: ../../Zotlabs/Module/Directory.php:368 ../../include/channel.php:1799
+#: ../../Zotlabs/Module/Directory.php:368 ../../include/channel.php:1834
msgid "About:"
msgstr "О себе:"
@@ -7856,7 +8020,7 @@ msgid "Error downloading wiki: "
msgstr "Ошибка загрузки Wiki:"
#: ../../Zotlabs/Module/Wiki.php:203 ../../Zotlabs/Widget/Wiki_list.php:15
-#: ../../include/nav.php:541
+#: ../../include/nav.php:539
msgid "Wikis"
msgstr ""
@@ -7875,19 +8039,19 @@ msgstr "Тип содержимого"
#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Wiki.php:368
#: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2115
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2143
#: ../../extend/addon/hzaddons/mdpost/mdpost.php:41
msgid "Markdown"
msgstr "Разметка Markdown"
#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Wiki.php:368
#: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2113
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2141
msgid "BBcode"
msgstr ""
#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2116
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2144
msgid "Text"
msgstr "Текст"
@@ -7931,7 +8095,7 @@ msgstr "Новая страница"
msgid "Revision Comparison"
msgstr "Сравнение ревизий"
-#: ../../Zotlabs/Module/Wiki.php:364 ../../Zotlabs/Lib/NativeWikiPage.php:579
+#: ../../Zotlabs/Module/Wiki.php:364 ../../Zotlabs/Lib/NativeWikiPage.php:585
#: ../../Zotlabs/Widget/Wiki_page_history.php:25
msgid "Revert"
msgstr "Отменить"
@@ -7957,7 +8121,7 @@ msgstr "Новое имя страницы"
msgid "Embed image from photo albums"
msgstr "Встроить изображение из фотоальбома"
-#: ../../Zotlabs/Module/Wiki.php:397 ../../include/conversation.php:1463
+#: ../../Zotlabs/Module/Wiki.php:397 ../../include/conversation.php:1477
#: ../../extend/addon/hzaddons/hsse/hsse.php:208
msgid "Embed an image from your albums"
msgstr "Встроить изображение из ваших альбомов"
@@ -8019,56 +8183,60 @@ msgid "You must be authenticated."
msgstr "Вы должны быть аутентифицированы."
#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:351
-#: ../../include/nav.php:449 ../../include/features.php:368
+#: ../../include/nav.php:447 ../../include/features.php:368
msgid "Photos"
msgstr "Фотографии"
#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Storage/Browser.php:351
#: ../../Zotlabs/Lib/Apps.php:346 ../../Zotlabs/Widget/Notifications.php:101
-#: ../../include/nav.php:457
+#: ../../include/nav.php:455
msgid "Files"
msgstr "Файлы"
-#: ../../Zotlabs/Module/Tokens.php:39
+#: ../../Zotlabs/Module/Tokens.php:49
#, php-format
msgid "This channel is limited to %d tokens"
msgstr "Этот канал ограничен %d токенами"
-#: ../../Zotlabs/Module/Tokens.php:45
+#: ../../Zotlabs/Module/Tokens.php:55
msgid "Name and Password are required."
msgstr "Требуются имя и пароль."
-#: ../../Zotlabs/Module/Tokens.php:85
+#: ../../Zotlabs/Module/Tokens.php:170
msgid "Token saved."
msgstr "Токен сохранён."
-#: ../../Zotlabs/Module/Tokens.php:131
+#: ../../Zotlabs/Module/Tokens.php:251
msgid ""
"Use this form to create temporary access identifiers to share things with "
"non-members. These identities may be used in Access Control Lists and "
"visitors may login using these credentials to access private content."
msgstr "Используйте эту форму для создания идентификаторов временного доступа для сторонних пользователей. Эти идентификаторы могут использоваться в списках контроля доступа, и посетители могут использовать эти учетные данные для доступа к частному контенту."
-#: ../../Zotlabs/Module/Tokens.php:133
+#: ../../Zotlabs/Module/Tokens.php:253
msgid ""
"You may also provide <em>dropbox</em> style access links to friends and "
"associates by adding the Login Password to any specific site URL as shown. "
"Examples:"
msgstr "Вы также можете предоставить доступ в стиле <em>dropbox</em> для друзей и коллег, добавив имя и пароль для входа на любой URL-адрес сайта. Например:"
-#: ../../Zotlabs/Module/Tokens.php:168
+#: ../../Zotlabs/Module/Tokens.php:282
+msgid "Select a role for this token"
+msgstr "Выбрать роль для этого токена"
+
+#: ../../Zotlabs/Module/Tokens.php:283
msgid "Guest Access Tokens"
msgstr "Токен гостевого доступа"
-#: ../../Zotlabs/Module/Tokens.php:175
+#: ../../Zotlabs/Module/Tokens.php:290
msgid "Login Name"
msgstr "Имя"
-#: ../../Zotlabs/Module/Tokens.php:176
+#: ../../Zotlabs/Module/Tokens.php:291
msgid "Login Password"
msgstr "Пароль"
-#: ../../Zotlabs/Module/Tokens.php:177
+#: ../../Zotlabs/Module/Tokens.php:292
msgid "Expires (yyyy-mm-dd)"
msgstr "Срок действия (yyyy-mm-dd)"
@@ -8122,7 +8290,7 @@ msgstr "Общие"
msgid "Add Files"
msgstr "Добавить файлы"
-#: ../../Zotlabs/Storage/Browser.php:369 ../../Zotlabs/Lib/ThreadItem.php:175
+#: ../../Zotlabs/Storage/Browser.php:369 ../../Zotlabs/Lib/ThreadItem.php:198
msgid "Admin Delete"
msgstr "Удалено администратором"
@@ -8202,39 +8370,6 @@ msgid ""
"an existing folder."
msgstr "Вы можете выбрать файлы с помощью кнопки загрузки или перетащить их сюда или в существующую папку."
-#: ../../Zotlabs/Lib/Group.php:28 ../../include/group.php:23
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Удаленная группа с этим названием была восстановлена. Существующие разрешения пункт <strong>могут</strong> применяться к этой группе и к её будущих участников. Если это не то, чего вы хотели, пожалуйста, создайте другую группу с другим именем."
-
-#: ../../Zotlabs/Lib/Group.php:270 ../../include/group.php:271
-msgid "Add new connections to this privacy group"
-msgstr "Добавить новые контакты в группу конфиденциальности"
-
-#: ../../Zotlabs/Lib/Group.php:302 ../../Zotlabs/Lib/AccessList.php:311
-#: ../../include/group.php:305
-msgid "edit"
-msgstr "редактировать"
-
-#: ../../Zotlabs/Lib/Group.php:325 ../../include/group.php:328
-msgid "Edit group"
-msgstr "Редактировать группу"
-
-#: ../../Zotlabs/Lib/Group.php:326 ../../include/group.php:329
-msgid "Add privacy group"
-msgstr "Добавить группу конфиденциальности"
-
-#: ../../Zotlabs/Lib/Group.php:327 ../../include/group.php:330
-msgid "Channels not in any privacy group"
-msgstr "Каналы не включены ни в одну группу конфиденциальности"
-
-#: ../../Zotlabs/Lib/Group.php:329 ../../Zotlabs/Lib/AccessList.php:336
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:332
-msgid "add"
-msgstr "добавить"
-
#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
msgid "Channel is blocked on this site."
msgstr "Канал блокируется на этом сайте."
@@ -8259,7 +8394,7 @@ msgstr "Протокол отключен."
msgid "Cannot connect to yourself."
msgstr "Нельзя подключиться к самому себе."
-#: ../../Zotlabs/Lib/Connect.php:271
+#: ../../Zotlabs/Lib/Connect.php:272
msgid "error saving data"
msgstr "ошибка сохранения данных"
@@ -8277,171 +8412,171 @@ msgstr "Ошибка обновления на %s"
msgid "Update %s failed. See error logs."
msgstr "Выполнение %s неудачно. Проверьте системный журнал."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:94
+#: ../../Zotlabs/Lib/NativeWikiPage.php:43
+#: ../../Zotlabs/Lib/NativeWikiPage.php:111
msgid "(No Title)"
msgstr "(нет заголовка)"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:109
+#: ../../Zotlabs/Lib/NativeWikiPage.php:125
msgid "Wiki page create failed."
msgstr "Не удалось создать страницу Wiki."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:123
+#: ../../Zotlabs/Lib/NativeWikiPage.php:139
msgid "Wiki not found."
msgstr "Wiki не найдена."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:134
+#: ../../Zotlabs/Lib/NativeWikiPage.php:150
msgid "Destination name already exists"
msgstr "Имя назначения уже существует"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:167
-#: ../../Zotlabs/Lib/NativeWikiPage.php:368
+#: ../../Zotlabs/Lib/NativeWikiPage.php:183
+#: ../../Zotlabs/Lib/NativeWikiPage.php:378
msgid "Page not found"
msgstr "Страница не найдена."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:200
+#: ../../Zotlabs/Lib/NativeWikiPage.php:213
msgid "Error reading page content"
msgstr "Ошибка чтения содержимого страницы"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
-#: ../../Zotlabs/Lib/NativeWikiPage.php:409
-#: ../../Zotlabs/Lib/NativeWikiPage.php:480
-#: ../../Zotlabs/Lib/NativeWikiPage.php:522
+#: ../../Zotlabs/Lib/NativeWikiPage.php:369
+#: ../../Zotlabs/Lib/NativeWikiPage.php:419
+#: ../../Zotlabs/Lib/NativeWikiPage.php:487
+#: ../../Zotlabs/Lib/NativeWikiPage.php:528
msgid "Error reading wiki"
msgstr "Ошибка чтения Wiki"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:396
+#: ../../Zotlabs/Lib/NativeWikiPage.php:406
msgid "Page update failed."
msgstr "Не удалось обновить страницу."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:431
+#: ../../Zotlabs/Lib/NativeWikiPage.php:441
msgid "Nothing deleted"
msgstr "Ничего не удалено"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:501
+#: ../../Zotlabs/Lib/NativeWikiPage.php:508
msgid "Compare: object not found."
msgstr "Сравнение: объект не найден."
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Zotlabs/Lib/NativeWikiPage.php:515
msgid "Page updated"
msgstr "Страница обновлена"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:511
-msgid "Untitled"
-msgstr "Не озаглавлено"
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:517
+#: ../../Zotlabs/Lib/NativeWikiPage.php:523
msgid "Wiki resource_id required for git commit"
msgstr "Требуется resource_id Wiki для отправки в Git"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:577
+#: ../../Zotlabs/Lib/NativeWikiPage.php:583
#: ../../Zotlabs/Widget/Wiki_page_history.php:23
msgctxt "wiki_history"
msgid "Message"
msgstr "Сообщение"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:578
+#: ../../Zotlabs/Lib/NativeWikiPage.php:584
#: ../../Zotlabs/Widget/Wiki_page_history.php:24
msgid "Date"
msgstr "Дата"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:580
+#: ../../Zotlabs/Lib/NativeWikiPage.php:586
#: ../../Zotlabs/Widget/Wiki_page_history.php:26
msgid "Compare"
msgstr "Сравнить"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:618 ../../include/bbcode.php:1050
-#: ../../include/bbcode.php:1238
+#: ../../Zotlabs/Lib/NativeWikiPage.php:624 ../../include/bbcode.php:1050
+#: ../../include/bbcode.php:1235
msgid "Different viewers will see this text differently"
msgstr "Различные зрители увидят этот текст по-разному"
-#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:742
-msgid "Private Message"
-msgstr "Личное сообщение"
+#: ../../Zotlabs/Lib/ThreadItem.php:109
+msgid "Restricted message"
+msgstr "Сообщение с ограниченным доступом"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:116
+msgid "Public Policy"
+msgstr "Политика общего доступа"
-#: ../../Zotlabs/Lib/ThreadItem.php:131
+#: ../../Zotlabs/Lib/ThreadItem.php:154
msgid "Privacy conflict. Discretion advised."
msgstr "Конфиликт настроек конфиденциальности."
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../include/conversation.php:729
+#: ../../Zotlabs/Lib/ThreadItem.php:204 ../../include/conversation.php:729
msgid "Select"
msgstr "Выбрать"
-#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
+#: ../../Zotlabs/Lib/ThreadItem.php:229 ../../Zotlabs/Widget/Pinned.php:70
msgid "I will attend"
msgstr "Я буду участвовать"
-#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
+#: ../../Zotlabs/Lib/ThreadItem.php:229 ../../Zotlabs/Widget/Pinned.php:70
msgid "I will not attend"
msgstr "Я не буду участвовать"
-#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
+#: ../../Zotlabs/Lib/ThreadItem.php:229 ../../Zotlabs/Widget/Pinned.php:70
msgid "I might attend"
msgstr "Я возможно буду присутствовать"
-#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
+#: ../../Zotlabs/Lib/ThreadItem.php:243 ../../Zotlabs/Widget/Pinned.php:81
msgid "I agree"
msgstr "Я согласен"
-#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
+#: ../../Zotlabs/Lib/ThreadItem.php:243 ../../Zotlabs/Widget/Pinned.php:81
msgid "I disagree"
msgstr "Я не согласен"
-#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
+#: ../../Zotlabs/Lib/ThreadItem.php:243 ../../Zotlabs/Widget/Pinned.php:81
msgid "I abstain"
msgstr "Я воздержался"
-#: ../../Zotlabs/Lib/ThreadItem.php:274 ../../include/conversation.php:736
+#: ../../Zotlabs/Lib/ThreadItem.php:297 ../../include/conversation.php:736
msgid "Toggle Star Status"
msgstr "Переключить статус пометки"
-#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../Zotlabs/Widget/Pinned.php:88
+#: ../../Zotlabs/Lib/ThreadItem.php:308 ../../Zotlabs/Widget/Pinned.php:88
#: ../../include/conversation.php:751
msgid "Message signature validated"
msgstr "Подпись сообщения проверена"
-#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../Zotlabs/Widget/Pinned.php:89
+#: ../../Zotlabs/Lib/ThreadItem.php:309 ../../Zotlabs/Widget/Pinned.php:89
#: ../../include/conversation.php:752
msgid "Message signature incorrect"
msgstr "Подпись сообщения неверная"
-#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../include/conversation.php:943
+#: ../../Zotlabs/Lib/ThreadItem.php:325 ../../include/conversation.php:943
msgid "Conversation Features"
msgstr "Возможности бесед"
-#: ../../Zotlabs/Lib/ThreadItem.php:318 ../../include/taxonomy.php:584
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/taxonomy.php:584
msgid "like"
msgstr "нравится"
-#: ../../Zotlabs/Lib/ThreadItem.php:319 ../../include/taxonomy.php:585
+#: ../../Zotlabs/Lib/ThreadItem.php:342 ../../include/taxonomy.php:585
msgid "dislike"
msgstr "не нравится"
-#: ../../Zotlabs/Lib/ThreadItem.php:320
+#: ../../Zotlabs/Lib/ThreadItem.php:343
msgid "Reply on this comment"
msgstr "Ответить на этот комментарий"
-#: ../../Zotlabs/Lib/ThreadItem.php:320
+#: ../../Zotlabs/Lib/ThreadItem.php:343
msgid "reply"
msgstr "ответить"
-#: ../../Zotlabs/Lib/ThreadItem.php:320
+#: ../../Zotlabs/Lib/ThreadItem.php:343
msgid "Reply to"
msgstr "Ответить"
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Widget/Pinned.php:99
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../Zotlabs/Widget/Pinned.php:99
msgid "Share This"
msgstr "Поделиться этим"
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Widget/Pinned.php:99
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../Zotlabs/Widget/Pinned.php:99
msgid "share"
msgstr "поделиться"
-#: ../../Zotlabs/Lib/ThreadItem.php:340
+#: ../../Zotlabs/Lib/ThreadItem.php:363
msgid "Delivery Report"
msgstr "Отчёт о доставке"
-#: ../../Zotlabs/Lib/ThreadItem.php:359
+#: ../../Zotlabs/Lib/ThreadItem.php:382
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
@@ -8449,148 +8584,148 @@ msgstr[0] "%d комментарий"
msgstr[1] "%d комментария"
msgstr[2] "%d комментариев"
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:383
#, php-format
msgid "%d unseen"
msgstr "новых %d"
-#: ../../Zotlabs/Lib/ThreadItem.php:413
+#: ../../Zotlabs/Lib/ThreadItem.php:436
msgid "to"
msgstr "к"
-#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Messages.php:99
+#: ../../Zotlabs/Lib/ThreadItem.php:437 ../../Zotlabs/Widget/Messages.php:99
#: ../../Zotlabs/Widget/Pinned.php:127
msgid "via"
msgstr "через"
-#: ../../Zotlabs/Lib/ThreadItem.php:415
+#: ../../Zotlabs/Lib/ThreadItem.php:438
msgid "Wall-to-Wall"
msgstr "Стена-на-Стену"
-#: ../../Zotlabs/Lib/ThreadItem.php:416
+#: ../../Zotlabs/Lib/ThreadItem.php:439
msgid "via Wall-To-Wall:"
msgstr "через Стена-на-Стену:"
-#: ../../Zotlabs/Lib/ThreadItem.php:430 ../../Zotlabs/Widget/Pinned.php:132
+#: ../../Zotlabs/Lib/ThreadItem.php:453 ../../Zotlabs/Widget/Pinned.php:132
#: ../../include/conversation.php:817
#, php-format
msgid "from %s"
msgstr "от %s"
-#: ../../Zotlabs/Lib/ThreadItem.php:433 ../../Zotlabs/Widget/Pinned.php:135
+#: ../../Zotlabs/Lib/ThreadItem.php:456 ../../Zotlabs/Widget/Pinned.php:135
#: ../../include/conversation.php:820
#, php-format
msgid "last edited: %s"
msgstr "последнее редактирование: %s"
-#: ../../Zotlabs/Lib/ThreadItem.php:434 ../../Zotlabs/Widget/Pinned.php:136
+#: ../../Zotlabs/Lib/ThreadItem.php:457 ../../Zotlabs/Widget/Pinned.php:136
#: ../../include/conversation.php:821
#, php-format
msgid "Expires: %s"
msgstr "Срок действия: %s"
-#: ../../Zotlabs/Lib/ThreadItem.php:444
+#: ../../Zotlabs/Lib/ThreadItem.php:467
msgid "Attend"
msgstr "Посетить"
-#: ../../Zotlabs/Lib/ThreadItem.php:445 ../../Zotlabs/Widget/Pinned.php:141
+#: ../../Zotlabs/Lib/ThreadItem.php:468 ../../Zotlabs/Widget/Pinned.php:141
msgid "Attendance Options"
msgstr "Параметры посещаемости"
-#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1921
+#: ../../Zotlabs/Lib/ThreadItem.php:469 ../../include/text.php:1946
msgid "Vote"
msgstr "Голосовать"
-#: ../../Zotlabs/Lib/ThreadItem.php:447 ../../Zotlabs/Widget/Pinned.php:142
+#: ../../Zotlabs/Lib/ThreadItem.php:470 ../../Zotlabs/Widget/Pinned.php:142
msgid "Voting Options"
msgstr "Параметры голосования"
-#: ../../Zotlabs/Lib/ThreadItem.php:462
+#: ../../Zotlabs/Lib/ThreadItem.php:485
msgid "Go to previous comment"
msgstr "Перейти к предыдущему комментарию"
-#: ../../Zotlabs/Lib/ThreadItem.php:471 ../../Zotlabs/Widget/Pinned.php:154
+#: ../../Zotlabs/Lib/ThreadItem.php:494 ../../Zotlabs/Widget/Pinned.php:154
msgid "Pinned post"
msgstr "Прикреплённая заметка"
-#: ../../Zotlabs/Lib/ThreadItem.php:473 ../../Zotlabs/Widget/Pinned.php:155
+#: ../../Zotlabs/Lib/ThreadItem.php:496 ../../Zotlabs/Widget/Pinned.php:155
#: ../../include/js_strings.php:39
msgid "Unpin from the top"
msgstr "Открепить"
-#: ../../Zotlabs/Lib/ThreadItem.php:473 ../../include/js_strings.php:38
+#: ../../Zotlabs/Lib/ThreadItem.php:496 ../../include/js_strings.php:38
msgid "Pin to the top"
msgstr "Прикрепить сверху"
-#: ../../Zotlabs/Lib/ThreadItem.php:474
+#: ../../Zotlabs/Lib/ThreadItem.php:497
#: ../../extend/addon/hzaddons/bookmarker/bookmarker.php:38
msgid "Save Bookmarks"
msgstr "Сохранить в закладках"
-#: ../../Zotlabs/Lib/ThreadItem.php:475
+#: ../../Zotlabs/Lib/ThreadItem.php:498
msgid "Add to Calendar"
msgstr "Добавить в календарь"
-#: ../../Zotlabs/Lib/ThreadItem.php:502 ../../include/conversation.php:516
+#: ../../Zotlabs/Lib/ThreadItem.php:525 ../../include/conversation.php:516
msgid "This is an unsaved preview"
msgstr "Это несохранённый просмотр"
-#: ../../Zotlabs/Lib/ThreadItem.php:535 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:558 ../../include/js_strings.php:7
#, php-format
msgid "%s show all"
msgstr "%s показать всё"
-#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1455
+#: ../../Zotlabs/Lib/ThreadItem.php:851 ../../include/conversation.php:1469
#: ../../extend/addon/hzaddons/hsse/hsse.php:200
msgid "Bold"
msgstr "Жирный"
-#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1456
+#: ../../Zotlabs/Lib/ThreadItem.php:852 ../../include/conversation.php:1470
#: ../../extend/addon/hzaddons/hsse/hsse.php:201
msgid "Italic"
msgstr "Курсив"
-#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1457
+#: ../../Zotlabs/Lib/ThreadItem.php:853 ../../include/conversation.php:1471
#: ../../extend/addon/hzaddons/hsse/hsse.php:202
msgid "Underline"
msgstr "Подчеркнутый"
-#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1458
+#: ../../Zotlabs/Lib/ThreadItem.php:854 ../../include/conversation.php:1472
#: ../../extend/addon/hzaddons/hsse/hsse.php:203
msgid "Quote"
msgstr "Цитата"
-#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1459
+#: ../../Zotlabs/Lib/ThreadItem.php:855 ../../include/conversation.php:1473
#: ../../extend/addon/hzaddons/hsse/hsse.php:204
msgid "Code"
msgstr "Код"
-#: ../../Zotlabs/Lib/ThreadItem.php:833
+#: ../../Zotlabs/Lib/ThreadItem.php:856
msgid "Image"
msgstr "Изображение"
-#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1460
+#: ../../Zotlabs/Lib/ThreadItem.php:857 ../../include/conversation.php:1474
#: ../../extend/addon/hzaddons/hsse/hsse.php:205
msgid "Attach/Upload file"
msgstr "Прикрепить/загрузить файл"
-#: ../../Zotlabs/Lib/ThreadItem.php:835
+#: ../../Zotlabs/Lib/ThreadItem.php:858
msgid "Insert Link"
msgstr "Вставить ссылку"
-#: ../../Zotlabs/Lib/ThreadItem.php:836
+#: ../../Zotlabs/Lib/ThreadItem.php:859
msgid "Video"
msgstr "Видео"
-#: ../../Zotlabs/Lib/ThreadItem.php:846
+#: ../../Zotlabs/Lib/ThreadItem.php:869
msgid "Your full name (required)"
msgstr "Ваше полное имя (требуется)"
-#: ../../Zotlabs/Lib/ThreadItem.php:847
+#: ../../Zotlabs/Lib/ThreadItem.php:870
msgid "Your email address (required)"
msgstr "Ваш адрес электронной почты (требуется)"
-#: ../../Zotlabs/Lib/ThreadItem.php:848
+#: ../../Zotlabs/Lib/ThreadItem.php:871
msgid "Your website URL (optional)"
msgstr "URL вашего вебсайта (необязательно)"
@@ -8615,12 +8750,8 @@ msgstr "Только этот веб-сайт"
msgid "Visible to your default audience"
msgstr "Видно вашей аудитории по умолчанию."
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
-#: ../../include/acl_selectors.php:136
-msgid "Only me"
-msgstr "Только мне"
-
#: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Zotlabs/Access/PermissionRoles.php:384
msgid "Public"
msgstr "Общедоступно"
@@ -8673,45 +8804,45 @@ msgstr "Это настройка по умолчанию для тех, кто
msgid "This is your default setting for the audience of your webpages"
msgstr "Это настройка по умолчанию для аудитории ваших веб-страниц"
-#: ../../Zotlabs/Lib/Activity.php:2213
+#: ../../Zotlabs/Lib/Activity.php:2285
#, php-format
msgid "Likes %1$s's %2$s"
msgstr "Нравится %1$s %2$s"
-#: ../../Zotlabs/Lib/Activity.php:2216
+#: ../../Zotlabs/Lib/Activity.php:2288
#, php-format
msgid "Doesn't like %1$s's %2$s"
msgstr "Не нравится %1$s %2$s"
-#: ../../Zotlabs/Lib/Activity.php:2222
+#: ../../Zotlabs/Lib/Activity.php:2294
#, php-format
msgid "Will attend %s's event"
msgstr "Присоединится к мероприятию %s"
-#: ../../Zotlabs/Lib/Activity.php:2225
+#: ../../Zotlabs/Lib/Activity.php:2297
#, php-format
msgid "Will not attend %s's event"
msgstr "Не присоединится к мероприятию %s"
-#: ../../Zotlabs/Lib/Activity.php:2228
+#: ../../Zotlabs/Lib/Activity.php:2300
#, php-format
msgid "May attend %s's event"
msgstr "Возможно присоединится к мероприятию %s"
-#: ../../Zotlabs/Lib/Activity.php:2231
+#: ../../Zotlabs/Lib/Activity.php:2303
#, php-format
msgid "May not attend %s's event"
msgstr "Возможно не присоединится к мероприятию %s"
-#: ../../Zotlabs/Lib/Activity.php:3156 ../../Zotlabs/Lib/Activity.php:3348
+#: ../../Zotlabs/Lib/Activity.php:3239 ../../Zotlabs/Lib/Activity.php:3431
#: ../../include/network.php:1742
-#: ../../extend/addon/hzaddons/pubcrawl/as.php:1338
-#: ../../extend/addon/hzaddons/pubcrawl/as.php:1778
-#: ../../extend/addon/hzaddons/pubcrawl/as.php:1986
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1332
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1776
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1987
msgid "ActivityPub"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:329 ../../include/nav.php:333
+#: ../../Zotlabs/Lib/Apps.php:329 ../../include/nav.php:331
msgid "Apps"
msgstr "Приложения"
@@ -8729,7 +8860,7 @@ msgid "Report Bug"
msgstr "Сообщить об ошибке"
#: ../../Zotlabs/Lib/Apps.php:336 ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/nav.php:482 ../../include/nav.php:485
+#: ../../include/nav.php:480 ../../include/nav.php:483
msgid "Chatrooms"
msgstr "Чаты"
@@ -8758,7 +8889,7 @@ msgstr "Менеджер каналов"
msgid "Stream"
msgstr "Поток"
-#: ../../Zotlabs/Lib/Apps.php:348 ../../include/nav.php:544
+#: ../../Zotlabs/Lib/Apps.php:348 ../../include/nav.php:542
msgid "Wiki"
msgstr ""
@@ -8766,8 +8897,8 @@ msgstr ""
msgid "Channel Home"
msgstr "Главная канала"
-#: ../../Zotlabs/Lib/Apps.php:352 ../../include/nav.php:468
-#: ../../include/nav.php:471 ../../include/features.php:82
+#: ../../Zotlabs/Lib/Apps.php:352 ../../include/nav.php:466
+#: ../../include/nav.php:469 ../../include/features.php:82
msgid "Calendar"
msgstr "Календарь"
@@ -8835,7 +8966,7 @@ msgstr ""
msgid "Guest Access"
msgstr "Гостевой доступ"
-#: ../../Zotlabs/Lib/Apps.php:376 ../../Zotlabs/Widget/Notes.php:21
+#: ../../Zotlabs/Lib/Apps.php:376 ../../Zotlabs/Widget/Notes.php:26
#: ../../extend/addon/hzaddons/workflow/workflow.php:2625
msgid "Notes"
msgstr "Записки"
@@ -8852,6 +8983,10 @@ msgstr "Менеджер OAuth2"
msgid "PDL Editor"
msgstr "Редактор PDL"
+#: ../../Zotlabs/Lib/Apps.php:380
+msgid "Permission Categories"
+msgstr "Категории разрешений"
+
#: ../../Zotlabs/Lib/Apps.php:382
msgid "My Chatrooms"
msgstr "Мои чаты"
@@ -8884,32 +9019,36 @@ msgstr "Добавить на панель навигации"
msgid "Unpin from navbar"
msgstr "Удалить с панели навигации"
-#: ../../Zotlabs/Lib/AccessList.php:28
+#: ../../Zotlabs/Lib/AccessList.php:26
msgid ""
"A deleted list with this name was revived. Existing item permissions "
"<strong>may</strong> apply to this list and any future members. If this is "
"not what you intended, please create another list with a different name."
msgstr "Восстановлен удаленный список с таким именем. Существующие разрешения на элементы <strong>могут</strong> применяться к этому списку и любым будущим участникам. Если не отвечает вашим намерениям - создайте еще один список с другим именем."
-#: ../../Zotlabs/Lib/AccessList.php:286
-msgid "Add new connections to this access list"
-msgstr "Добавить новый контакт в список доступа"
+#: ../../Zotlabs/Lib/AccessList.php:265
+msgid "Select a privacy group"
+msgstr "Выбрать группу конфиденциальности"
-#: ../../Zotlabs/Lib/AccessList.php:331
-msgid "Lists"
-msgstr "Списки"
+#: ../../Zotlabs/Lib/AccessList.php:329 ../../include/group.php:305
+msgid "edit"
+msgstr "редактировать"
+
+#: ../../Zotlabs/Lib/AccessList.php:350 ../../include/group.php:328
+msgid "Edit group"
+msgstr "Редактировать группу"
-#: ../../Zotlabs/Lib/AccessList.php:332
-msgid "Edit list"
-msgstr "Редактировать список"
+#: ../../Zotlabs/Lib/AccessList.php:351
+msgid "Create new group"
+msgstr "Создать новую группу"
-#: ../../Zotlabs/Lib/AccessList.php:333
-msgid "Create new list"
-msgstr "Создать новый список"
+#: ../../Zotlabs/Lib/AccessList.php:352 ../../include/group.php:330
+msgid "Channels not in any privacy group"
+msgstr "Каналы не включены ни в одну группу конфиденциальности"
-#: ../../Zotlabs/Lib/AccessList.php:334
-msgid "Channels not in any access list"
-msgstr "Каналы, не входящие ни в один список доступа"
+#: ../../Zotlabs/Lib/AccessList.php:354
+msgid "Add"
+msgstr "Добавить"
#: ../../Zotlabs/Lib/Enotify.php:60
msgid "$Projectname Notification"
@@ -9279,99 +9418,96 @@ msgstr "4. Эксперт - я умею программировать"
msgid "5. Wizard - I probably know more than you do"
msgstr "5. Волшебник - возможно я знаю больше чем ты"
-#: ../../Zotlabs/Lib/Permcat.php:82
-msgctxt "permcat"
-msgid "default"
-msgstr "по умолчанию"
-
-#: ../../Zotlabs/Lib/Permcat.php:133
-msgctxt "permcat"
-msgid "follower"
-msgstr "поклонник"
-
-#: ../../Zotlabs/Lib/Permcat.php:137
-msgctxt "permcat"
-msgid "contributor"
-msgstr "участник"
-
-#: ../../Zotlabs/Lib/Permcat.php:141
+#: ../../Zotlabs/Lib/Permcat.php:84
msgctxt "permcat"
-msgid "publisher"
-msgstr "издатель"
+msgid "Default"
+msgstr "По умолчанию"
-#: ../../Zotlabs/Lib/Libsync.php:750
+#: ../../Zotlabs/Lib/Libsync.php:748
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Невозможно проверить подпись сайта %s"
-#: ../../Zotlabs/Lib/Libzot.php:671
+#: ../../Zotlabs/Lib/Libzot.php:673
msgid "Unable to verify channel signature"
msgstr "Невозможно проверить подпись канала"
-#: ../../Zotlabs/Access/PermissionRoles.php:287
+#: ../../Zotlabs/Access/PermissionRoles.php:337
msgid "Social Networking"
msgstr "Социальная Сеть"
-#: ../../Zotlabs/Access/PermissionRoles.php:288
+#: ../../Zotlabs/Access/PermissionRoles.php:338
msgid "Social - Federation"
msgstr "Социальная - Федерация"
-#: ../../Zotlabs/Access/PermissionRoles.php:289
+#: ../../Zotlabs/Access/PermissionRoles.php:339
msgid "Social - Mostly Public"
msgstr "Социальная - В основном общественный"
-#: ../../Zotlabs/Access/PermissionRoles.php:290
+#: ../../Zotlabs/Access/PermissionRoles.php:340
msgid "Social - Restricted"
msgstr "Социальная - Ограниченный"
-#: ../../Zotlabs/Access/PermissionRoles.php:291
+#: ../../Zotlabs/Access/PermissionRoles.php:341
msgid "Social - Private"
msgstr "Социальная - Частный"
-#: ../../Zotlabs/Access/PermissionRoles.php:294
+#: ../../Zotlabs/Access/PermissionRoles.php:344
msgid "Community Forum"
msgstr "Форум сообщества"
-#: ../../Zotlabs/Access/PermissionRoles.php:295
+#: ../../Zotlabs/Access/PermissionRoles.php:345
msgid "Forum - Mostly Public"
msgstr "Форум - В основном общественный"
-#: ../../Zotlabs/Access/PermissionRoles.php:296
+#: ../../Zotlabs/Access/PermissionRoles.php:346
msgid "Forum - Restricted"
msgstr "Форум - Ограниченный"
-#: ../../Zotlabs/Access/PermissionRoles.php:297
+#: ../../Zotlabs/Access/PermissionRoles.php:347
msgid "Forum - Private"
msgstr "Форум - Частный"
-#: ../../Zotlabs/Access/PermissionRoles.php:300
+#: ../../Zotlabs/Access/PermissionRoles.php:350
msgid "Feed Republish"
msgstr "Публиковать ленты новостей"
-#: ../../Zotlabs/Access/PermissionRoles.php:301
+#: ../../Zotlabs/Access/PermissionRoles.php:351
msgid "Feed - Mostly Public"
msgstr "Ленты новостей - В основном общественный"
-#: ../../Zotlabs/Access/PermissionRoles.php:302
+#: ../../Zotlabs/Access/PermissionRoles.php:352
msgid "Feed - Restricted"
msgstr "Ленты новостей - Ограниченный"
-#: ../../Zotlabs/Access/PermissionRoles.php:305
+#: ../../Zotlabs/Access/PermissionRoles.php:355
msgid "Special Purpose"
msgstr "Спец. назначение"
-#: ../../Zotlabs/Access/PermissionRoles.php:306
+#: ../../Zotlabs/Access/PermissionRoles.php:356
msgid "Special - Celebrity/Soapbox"
msgstr "Спец. назначение - Знаменитость/Soapbox"
-#: ../../Zotlabs/Access/PermissionRoles.php:307
+#: ../../Zotlabs/Access/PermissionRoles.php:357
msgid "Special - Group Repository"
msgstr "Спец. назначение - Групповой репозиторий"
-#: ../../Zotlabs/Access/PermissionRoles.php:311
+#: ../../Zotlabs/Access/PermissionRoles.php:361
msgid "Custom/Expert Mode"
msgstr "Экспертный режим"
+#: ../../Zotlabs/Access/PermissionRoles.php:385
+msgid "Personal"
+msgstr "Личное"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:386
+msgid "Community forum"
+msgstr "Форум сообщества"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:387
+msgid "Custom"
+msgstr "Собственные"
+
#: ../../Zotlabs/Access/Permissions.php:56
msgid "Can view my channel stream and posts"
msgstr "Может просматривать мой поток и сообщения"
@@ -9429,16 +9565,12 @@ msgid "Can like/dislike profiles and profile things"
msgstr "Может комментировать или отмечать как нравится/ненравится мой профиль"
#: ../../Zotlabs/Access/Permissions.php:70
-msgid "Can forward direct messages to all my channel connections (forum)"
-msgstr "Может пересылать личные сообщения всем своим контактам (форум)"
-
-#: ../../Zotlabs/Access/Permissions.php:71
msgid "Can chat with me"
msgstr "Может общаться со мной в чате"
-#: ../../Zotlabs/Access/Permissions.php:72
-msgid "Can source my public posts in derived channels"
-msgstr "Может использовать мои публичные сообщения в клонированных лентах сообщений"
+#: ../../Zotlabs/Access/Permissions.php:71
+msgid "Can source/mirror my public posts in derived channels"
+msgstr "Могу ли я создавать / зеркалировать мои общедоступные сообщения в производных каналах"
#: ../../Zotlabs/Access/Permissions.php:73
msgid "Can administer my channel"
@@ -9552,7 +9684,7 @@ msgstr "Просмотр очереди"
msgid "DB updates"
msgstr "Обновление базы данных"
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:198
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:196
msgid "Admin"
msgstr "Администрирование"
@@ -9847,7 +9979,7 @@ msgstr "Загрузить фотографию профиля"
msgid "Upload cover photo"
msgstr "Загрузить фотографию обложки"
-#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:117
+#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:115
msgid "Edit your profile"
msgstr "Редактировать профиль"
@@ -9931,6 +10063,10 @@ msgstr "Удалить выражение"
msgid "Saved Searches"
msgstr "Сохранённые поиски"
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:332
+msgid "add"
+msgstr "добавить"
+
#: ../../Zotlabs/Widget/Messages.php:24
msgid "Public and restricted messages"
msgstr "Общедоступные и частные публикации"
@@ -9947,6 +10083,26 @@ msgstr "Отмеченные публикации"
msgid "No messages"
msgstr "Сообщений нет"
+#: ../../Zotlabs/Widget/Notes.php:27
+msgid "Read mode"
+msgstr "Читать дальше"
+
+#: ../../Zotlabs/Widget/Notes.php:28
+msgid "Edit mode"
+msgstr "Режим редактирования"
+
+#: ../../Zotlabs/Widget/Notes.php:29
+msgid "Editing"
+msgstr "Редактируем"
+
+#: ../../Zotlabs/Widget/Notes.php:30
+msgid "Saving"
+msgstr "Сохраняем"
+
+#: ../../Zotlabs/Widget/Notes.php:31
+msgid "Saved"
+msgstr "Сохранено"
+
#: ../../Zotlabs/Widget/Mailmenu.php:13
msgid "Private Mail Menu"
msgstr "Меню личной переписки"
@@ -9963,6 +10119,10 @@ msgstr "Входящие"
msgid "Outbox"
msgstr "Исходящие"
+#: ../../Zotlabs/Widget/Permcats.php:81
+msgid "Role members"
+msgstr "Обладатели роли"
+
#: ../../Zotlabs/Widget/Rating.php:51
msgid "Rating Tools"
msgstr "Инструменты оценки"
@@ -9989,11 +10149,6 @@ msgstr "Активность"
msgid "App Categories"
msgstr "Категории приложений"
-#: ../../Zotlabs/Widget/Follow.php:22
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "У вас есть %1$.0f из %2$.0f разрешенных контактов."
-
#: ../../Zotlabs/Widget/Follow.php:29
msgid "Add New Connection"
msgstr "Добавить новый контакт"
@@ -10044,11 +10199,15 @@ msgstr "Настройки аккаунта"
msgid "Channel settings"
msgstr "Настройки канала"
-#: ../../Zotlabs/Widget/Settings_menu.php:46
+#: ../../Zotlabs/Widget/Settings_menu.php:44
+msgid "Privacy settings"
+msgstr "Настройки конфиденциальности"
+
+#: ../../Zotlabs/Widget/Settings_menu.php:51
msgid "Display settings"
msgstr "Настройки отображения"
-#: ../../Zotlabs/Widget/Settings_menu.php:53
+#: ../../Zotlabs/Widget/Settings_menu.php:58
msgid "Manage locations"
msgstr "Управление местоположением"
@@ -10105,201 +10264,205 @@ msgstr "В процессе"
msgid "Cancelled"
msgstr "Отменено"
-#: ../../include/event.php:1424 ../../include/connections.php:726
+#: ../../include/event.php:1424 ../../include/connections.php:753
msgid "Home, Voice"
msgstr "Дом, голос"
-#: ../../include/event.php:1425 ../../include/connections.php:727
+#: ../../include/event.php:1425 ../../include/connections.php:754
msgid "Home, Fax"
msgstr "Дом, факс"
-#: ../../include/event.php:1427 ../../include/connections.php:729
+#: ../../include/event.php:1427 ../../include/connections.php:756
msgid "Work, Voice"
msgstr "Работа, голос"
-#: ../../include/event.php:1428 ../../include/connections.php:730
+#: ../../include/event.php:1428 ../../include/connections.php:757
msgid "Work, Fax"
msgstr "Работа, факс"
-#: ../../include/channel.php:46
+#: ../../include/channel.php:48
msgid "Unable to obtain identity information from database"
msgstr "Невозможно получить идентификационную информацию из базы данных"
-#: ../../include/channel.php:79
+#: ../../include/channel.php:81
msgid "Empty name"
msgstr "Пустое имя"
-#: ../../include/channel.php:82
+#: ../../include/channel.php:84
msgid "Name too long"
msgstr "Слишком длинное имя"
-#: ../../include/channel.php:199
+#: ../../include/channel.php:201
msgid "No account identifier"
msgstr "Идентификатор аккаунта отсутствует"
-#: ../../include/channel.php:290
+#: ../../include/channel.php:292
msgid "Unable to retrieve created identity"
msgstr "Не удается получить созданный идентификатор"
-#: ../../include/channel.php:393
+#: ../../include/channel.php:402
msgid "Default Profile"
msgstr "Профиль по умолчанию"
-#: ../../include/channel.php:590 ../../include/channel.php:679
+#: ../../include/channel.php:592 ../../include/channel.php:681
msgid "Unable to retrieve modified identity"
msgstr "Не удается найти изменённый идентификатор"
-#: ../../include/channel.php:1340
+#: ../../include/channel.php:1373
msgid "Requested channel is not available"
msgstr "Запрошенный канал недоступен"
-#: ../../include/channel.php:1497
+#: ../../include/channel.php:1531
msgid "Create New Profile"
msgstr "Создать новый профиль"
-#: ../../include/channel.php:1500 ../../include/nav.php:117
+#: ../../include/channel.php:1534 ../../include/nav.php:115
#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:59
msgid "Edit Profile"
msgstr "Редактировать профиль"
-#: ../../include/channel.php:1518
+#: ../../include/channel.php:1552
msgid "Visible to everybody"
msgstr "Видно всем"
-#: ../../include/channel.php:1595 ../../include/channel.php:1723
+#: ../../include/channel.php:1629 ../../include/channel.php:1758
msgid "Gender:"
msgstr "Пол:"
-#: ../../include/channel.php:1596 ../../include/channel.php:1767
+#: ../../include/channel.php:1630 ../../include/channel.php:1802
msgid "Status:"
msgstr "Статус:"
-#: ../../include/channel.php:1597 ../../include/channel.php:1791
+#: ../../include/channel.php:1631 ../../include/channel.php:1826
msgid "Homepage:"
msgstr "Домашняя страница:"
-#: ../../include/channel.php:1598
+#: ../../include/channel.php:1633
msgid "Online Now"
msgstr "Сейчас в сети"
-#: ../../include/channel.php:1651
+#: ../../include/channel.php:1686
msgid "Change your profile photo"
msgstr "Изменить фотографию вашего профиля"
-#: ../../include/channel.php:1678 ../../include/selectors.php:60
+#: ../../include/channel.php:1713 ../../include/selectors.php:60
#: ../../include/selectors.php:77
#: ../../extend/addon/hzaddons/openid/Mod_Id.php:87
msgid "Female"
msgstr "Женщина"
-#: ../../include/channel.php:1680 ../../include/selectors.php:60
+#: ../../include/channel.php:1715 ../../include/selectors.php:60
#: ../../include/selectors.php:77
#: ../../extend/addon/hzaddons/openid/Mod_Id.php:85
msgid "Male"
msgstr "Мужчина"
-#: ../../include/channel.php:1682
+#: ../../include/channel.php:1717
msgid "Trans"
msgstr "Трансексуал"
-#: ../../include/channel.php:1684 ../../include/selectors.php:60
+#: ../../include/channel.php:1719 ../../include/selectors.php:60
msgid "Neuter"
msgstr "Среднего рода"
-#: ../../include/channel.php:1686 ../../include/selectors.php:60
+#: ../../include/channel.php:1721 ../../include/selectors.php:60
msgid "Non-specific"
msgstr "Неспецифический"
-#: ../../include/channel.php:1728
+#: ../../include/channel.php:1756
+msgid "Full Name:"
+msgstr "Полное имя:"
+
+#: ../../include/channel.php:1763
msgid "Like this channel"
msgstr "нравится этот канал"
-#: ../../include/channel.php:1752
+#: ../../include/channel.php:1787
msgid "j F, Y"
msgstr ""
-#: ../../include/channel.php:1753
+#: ../../include/channel.php:1788
msgid "j F"
msgstr ""
-#: ../../include/channel.php:1760
+#: ../../include/channel.php:1795
msgid "Birthday:"
msgstr "День рождения:"
-#: ../../include/channel.php:1773
+#: ../../include/channel.php:1808
#, php-format
msgid "for %1$d %2$s"
msgstr "для %1$d %2$s"
-#: ../../include/channel.php:1785
+#: ../../include/channel.php:1820
msgid "Tags:"
msgstr "Теги:"
-#: ../../include/channel.php:1789
+#: ../../include/channel.php:1824
msgid "Sexual Preference:"
msgstr "Сексуальные предпочтения:"
-#: ../../include/channel.php:1795
+#: ../../include/channel.php:1830
msgid "Political Views:"
msgstr "Политические взгляды:"
-#: ../../include/channel.php:1797
+#: ../../include/channel.php:1832
msgid "Religion:"
msgstr "Религия:"
-#: ../../include/channel.php:1801
+#: ../../include/channel.php:1836
msgid "Hobbies/Interests:"
msgstr "Хобби / интересы:"
-#: ../../include/channel.php:1803
+#: ../../include/channel.php:1838
msgid "Likes:"
msgstr "Что вам нравится:"
-#: ../../include/channel.php:1805
+#: ../../include/channel.php:1840
msgid "Dislikes:"
msgstr "Что вам не нравится:"
-#: ../../include/channel.php:1807
+#: ../../include/channel.php:1842
msgid "Contact information and Social Networks:"
msgstr "Контактная информация и социальные сети:"
-#: ../../include/channel.php:1809
+#: ../../include/channel.php:1844
msgid "My other channels:"
msgstr "Мои другие каналы:"
-#: ../../include/channel.php:1811
+#: ../../include/channel.php:1846
msgid "Musical interests:"
msgstr "Музыкальные интересы:"
-#: ../../include/channel.php:1813
+#: ../../include/channel.php:1848
msgid "Books, literature:"
msgstr "Книги, литература:"
-#: ../../include/channel.php:1815
+#: ../../include/channel.php:1850
msgid "Television:"
msgstr "Телевидение:"
-#: ../../include/channel.php:1817
+#: ../../include/channel.php:1852
msgid "Film/dance/culture/entertainment:"
msgstr "Кино / танцы / культура / развлечения:"
-#: ../../include/channel.php:1819
+#: ../../include/channel.php:1854
msgid "Love/Romance:"
msgstr "Любовь / романтика:"
-#: ../../include/channel.php:1821
+#: ../../include/channel.php:1856
msgid "Work/employment:"
msgstr "Работа / занятость:"
-#: ../../include/channel.php:1823
+#: ../../include/channel.php:1858
msgid "School/education:"
msgstr "Школа / образование:"
-#: ../../include/channel.php:1846
+#: ../../include/channel.php:1881
msgid "Like this thing"
msgstr "нравится этo"
-#: ../../include/channel.php:1847
+#: ../../include/channel.php:1882
msgid "Export"
msgstr "Экспорт"
@@ -10414,7 +10577,7 @@ msgstr "День рождения %1$s"
msgid "Happy Birthday %1$s"
msgstr "С Днем рождения %1$s !"
-#: ../../include/language.php:428 ../../include/text.php:2095
+#: ../../include/language.php:428 ../../include/text.php:2123
msgid "default"
msgstr "по умолчанию"
@@ -10462,7 +10625,7 @@ msgstr "Помощь:"
msgid "Not Found"
msgstr "Не найдено"
-#: ../../include/zid.php:403
+#: ../../include/zid.php:406
#, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr "OpenWebAuth: %1$s приветствует %2$s"
@@ -10487,34 +10650,34 @@ msgstr "Встроенное содержимое"
msgid "Embedding disabled"
msgstr "Встраивание отключено"
-#: ../../include/photos.php:154
+#: ../../include/photos.php:153
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
msgstr "Файл превышает предельный размер для сайта в %lu байт"
-#: ../../include/photos.php:165
+#: ../../include/photos.php:164
msgid "Image file is empty."
msgstr "Файл изображения пуст."
-#: ../../include/photos.php:327
+#: ../../include/photos.php:324
msgid "Photo storage failed."
msgstr "Ошибка хранилища фотографий."
-#: ../../include/photos.php:376
+#: ../../include/photos.php:373
msgid "a new photo"
msgstr "новая фотография"
-#: ../../include/photos.php:380
+#: ../../include/photos.php:377
#, php-format
msgctxt "photo_upload"
msgid "%1$s posted %2$s to %3$s"
msgstr "%1$s опубликовал %2$s в %3$s"
-#: ../../include/photos.php:714 ../../include/nav.php:452
+#: ../../include/photos.php:722 ../../include/nav.php:450
msgid "Photo Albums"
msgstr "Фотоальбомы"
-#: ../../include/photos.php:719
+#: ../../include/photos.php:727
msgid "Upload New Photos"
msgstr "Загрузить новые фотографии"
@@ -10523,14 +10686,29 @@ msgstr "Загрузить новые фотографии"
msgid "This is the home page of %s."
msgstr "Это домашняя страница %s."
-#: ../../include/connections.php:134
+#: ../../include/connections.php:136
msgid "New window"
msgstr "Новое окно"
-#: ../../include/connections.php:135
+#: ../../include/connections.php:137
msgid "Open the selected location in a different window or browser tab"
msgstr "Открыть выбранное местоположение в другом окне или вкладке браузера"
+#: ../../include/group.php:23
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Удаленная группа с этим названием была восстановлена. Существующие разрешения пункт <strong>могут</strong> применяться к этой группе и к её будущих участников. Если это не то, чего вы хотели, пожалуйста, создайте другую группу с другим именем."
+
+#: ../../include/group.php:271
+msgid "Add new connections to this privacy group"
+msgstr "Добавить новые контакты в группу конфиденциальности"
+
+#: ../../include/group.php:329
+msgid "Manage privacy groups"
+msgstr "Управлять группами конфиденциальности"
+
#: ../../include/auth.php:194
msgid "Delegation session ended."
msgstr "Делегированная сессия завершена."
@@ -10548,7 +10726,7 @@ msgid "Failed authentication"
msgstr "Ошибка аутентификации"
#: ../../include/auth.php:320
-#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:188
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:189
msgid "Login failed."
msgstr "Не удалось войти."
@@ -10565,106 +10743,102 @@ msgid "Manage your channels"
msgstr "Управление вашими каналами"
#: ../../include/nav.php:101
-msgid "Manage your privacy groups"
-msgstr "Управление вашим группами конфиденциальности"
-
-#: ../../include/nav.php:103
msgid "Account/Channel Settings"
msgstr "Настройки аккаунта / канала"
-#: ../../include/nav.php:109 ../../include/nav.php:139
+#: ../../include/nav.php:107 ../../include/nav.php:137
msgid "End this session"
msgstr "Закончить эту сессию"
-#: ../../include/nav.php:112
+#: ../../include/nav.php:110
msgid "Your profile page"
msgstr "Страницa вашего профиля"
-#: ../../include/nav.php:115
+#: ../../include/nav.php:113
msgid "Manage/Edit profiles"
msgstr "Управление / редактирование профилей"
-#: ../../include/nav.php:124 ../../include/nav.php:128
+#: ../../include/nav.php:122 ../../include/nav.php:126
msgid "Sign in"
msgstr "Войти"
-#: ../../include/nav.php:158
+#: ../../include/nav.php:156
msgid "Take me home"
msgstr "Домой"
-#: ../../include/nav.php:160
+#: ../../include/nav.php:158
msgid "Log me out of this site"
msgstr "Выйти с этого сайта"
-#: ../../include/nav.php:165
+#: ../../include/nav.php:163
msgid "Create an account"
msgstr "Создать аккаунт"
-#: ../../include/nav.php:178
+#: ../../include/nav.php:176
msgid "Help and documentation"
msgstr "Справочная информация и документация"
-#: ../../include/nav.php:192
+#: ../../include/nav.php:190
msgid "Search site @name, !forum, #tag, ?docs, content"
msgstr "Искать на сайте @имя, !форум, #тег, ?документ, содержимое"
-#: ../../include/nav.php:198
+#: ../../include/nav.php:196
msgid "Site Setup and Configuration"
msgstr "Установка и конфигурация сайта"
-#: ../../include/nav.php:326
+#: ../../include/nav.php:324
msgid "@name, #tag, ?doc, content"
msgstr "@имя, #тег, ?документ, содержимое"
-#: ../../include/nav.php:327
+#: ../../include/nav.php:325
msgid "Please wait..."
msgstr "Подождите пожалуйста ..."
-#: ../../include/nav.php:334
+#: ../../include/nav.php:332
msgid "Channel Apps"
msgstr "Приложения канала"
-#: ../../include/nav.php:335
+#: ../../include/nav.php:333
msgid "System Apps"
msgstr "Системные приложения"
-#: ../../include/nav.php:336
+#: ../../include/nav.php:334
msgid "Pinned Apps"
msgstr "Прикреплённые приложения"
-#: ../../include/nav.php:337
+#: ../../include/nav.php:335
msgid "Featured Apps"
msgstr "Популярные приложения"
-#: ../../include/nav.php:429
+#: ../../include/nav.php:427
msgid "Status Messages and Posts"
msgstr "Статусы и публикации"
-#: ../../include/nav.php:442
+#: ../../include/nav.php:440
msgid "Profile Details"
msgstr "Информация о профиле"
-#: ../../include/nav.php:460
+#: ../../include/nav.php:458
msgid "Files and Storage"
msgstr "Файлы и хранилище"
-#: ../../include/nav.php:498
+#: ../../include/nav.php:496
msgid "Saved Bookmarks"
msgstr "Сохранённые закладки"
-#: ../../include/nav.php:509
+#: ../../include/nav.php:507
msgid "View Cards"
msgstr "Просмотреть карточки"
-#: ../../include/nav.php:520
+#: ../../include/nav.php:518
msgid "View Articles"
msgstr "Просмотр статей"
-#: ../../include/nav.php:532
+#: ../../include/nav.php:530
msgid "View Webpages"
msgstr "Просмотр веб-страниц"
-#: ../../include/feedutils.php:874 ../../include/text.php:1541
+#: ../../include/feedutils.php:874 ../../include/text.php:1538
msgid "unknown"
msgstr "неизвестный"
@@ -10717,11 +10891,15 @@ msgstr "%1$s теперь в контакте с %2$s"
msgid "%1$s poked %2$s"
msgstr "%1$s ткнул %2$s"
-#: ../../include/conversation.php:267 ../../include/text.php:1237
-#: ../../include/text.php:1241
+#: ../../include/conversation.php:267 ../../include/text.php:1234
+#: ../../include/text.php:1238
msgid "poked"
msgstr "ткнут"
+#: ../../include/conversation.php:742
+msgid "Private Message"
+msgstr "Личное сообщение"
+
#: ../../include/conversation.php:789
#, php-format
msgid "View %s's profile @ %s"
@@ -10763,21 +10941,21 @@ msgstr "Следить за темой"
msgid "Unfollow Thread"
msgstr "Прекратить отслеживать тему"
-#: ../../include/conversation.php:1116
+#: ../../include/conversation.php:1122
msgid "Edit Connection"
msgstr "Редактировать контакт"
-#: ../../include/conversation.php:1268
+#: ../../include/conversation.php:1282
#, php-format
msgid "%s likes this."
msgstr "%s нравится это."
-#: ../../include/conversation.php:1268
+#: ../../include/conversation.php:1282
#, php-format
msgid "%s doesn't like this."
msgstr "%s не нравится это."
-#: ../../include/conversation.php:1272
+#: ../../include/conversation.php:1286
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgid_plural "<span %1$s>%2$d people</span> like this."
@@ -10785,7 +10963,7 @@ msgstr[0] "<span %1$s>%2$d человеку</span> это нравится."
msgstr[1] "<span %1$s>%2$d человекам</span> это нравится."
msgstr[2] "<span %1$s>%2$d человекам</span> это нравится."
-#: ../../include/conversation.php:1274
+#: ../../include/conversation.php:1288
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgid_plural "<span %1$s>%2$d people</span> don't like this."
@@ -10793,11 +10971,11 @@ msgstr[0] "<span %1$s>%2$d человеку</span> это не нравится
msgstr[1] "<span %1$s>%2$d человекам</span> это не нравится."
msgstr[2] "<span %1$s>%2$d человекам</span> это не нравится."
-#: ../../include/conversation.php:1280
+#: ../../include/conversation.php:1294
msgid "and"
msgstr "и"
-#: ../../include/conversation.php:1283
+#: ../../include/conversation.php:1297
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
@@ -10805,140 +10983,140 @@ msgstr[0] ", и ещё %d человеку"
msgstr[1] ", и ещё %d человекам"
msgstr[2] ", и ещё %d человекам"
-#: ../../include/conversation.php:1284
+#: ../../include/conversation.php:1298
#, php-format
msgid "%s like this."
msgstr "%s нравится это."
-#: ../../include/conversation.php:1284
+#: ../../include/conversation.php:1298
#, php-format
msgid "%s don't like this."
msgstr "%s не нравится это."
-#: ../../include/conversation.php:1335
+#: ../../include/conversation.php:1349
#: ../../extend/addon/hzaddons/hsse/hsse.php:82
msgid "Set your location"
msgstr "Задать своё местоположение"
-#: ../../include/conversation.php:1336
+#: ../../include/conversation.php:1350
#: ../../extend/addon/hzaddons/hsse/hsse.php:83
msgid "Clear browser location"
msgstr "Очистить местоположение из браузера"
-#: ../../include/conversation.php:1352
+#: ../../include/conversation.php:1366
#: ../../extend/addon/hzaddons/hsse/hsse.php:99
msgid "Embed (existing) photo from your photo albums"
msgstr "Встроить (существующее) фото из вашего фотоальбома"
-#: ../../include/conversation.php:1386
+#: ../../include/conversation.php:1400
#: ../../extend/addon/hzaddons/hsse/hsse.php:135
msgid "Tag term:"
msgstr "Теги:"
-#: ../../include/conversation.php:1387
+#: ../../include/conversation.php:1401
#: ../../extend/addon/hzaddons/hsse/hsse.php:136
msgid "Where are you right now?"
msgstr "Где вы сейчас?"
-#: ../../include/conversation.php:1392
+#: ../../include/conversation.php:1406
#: ../../extend/addon/hzaddons/hsse/hsse.php:141
msgid "Choose a different album..."
msgstr "Выбрать другой альбом..."
-#: ../../include/conversation.php:1396
+#: ../../include/conversation.php:1410
#: ../../extend/addon/hzaddons/hsse/hsse.php:145
msgid "Comments enabled"
msgstr "Комментарии включены"
-#: ../../include/conversation.php:1397
+#: ../../include/conversation.php:1411
#: ../../extend/addon/hzaddons/hsse/hsse.php:146
msgid "Comments disabled"
msgstr "Комментарии отключены"
-#: ../../include/conversation.php:1450
+#: ../../include/conversation.php:1464
#: ../../extend/addon/hzaddons/hsse/hsse.php:195
msgid "Page link name"
msgstr "Название ссылки на страницу "
-#: ../../include/conversation.php:1453
+#: ../../include/conversation.php:1467
#: ../../extend/addon/hzaddons/hsse/hsse.php:198
msgid "Post as"
msgstr "Опубликовать как"
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1481
#: ../../extend/addon/hzaddons/hsse/hsse.php:212
msgid "Toggle voting"
msgstr "Переключить голосование"
-#: ../../include/conversation.php:1468
+#: ../../include/conversation.php:1482
msgid "Toggle poll"
msgstr "Переключить опрос"
-#: ../../include/conversation.php:1469
+#: ../../include/conversation.php:1483
msgid "Option"
msgstr "Вариант"
-#: ../../include/conversation.php:1470
+#: ../../include/conversation.php:1484
msgid "Add option"
msgstr "Добавить вариант"
-#: ../../include/conversation.php:1471
+#: ../../include/conversation.php:1485
msgid "Minutes"
msgstr "Минут"
-#: ../../include/conversation.php:1471
+#: ../../include/conversation.php:1485
msgid "Hours"
msgstr "Часов"
-#: ../../include/conversation.php:1471
+#: ../../include/conversation.php:1485
msgid "Days"
msgstr "Дней"
-#: ../../include/conversation.php:1472
+#: ../../include/conversation.php:1486
msgid "Allow multiple answers"
msgstr "Разрешить несколько ответов"
-#: ../../include/conversation.php:1474
+#: ../../include/conversation.php:1488
#: ../../extend/addon/hzaddons/hsse/hsse.php:215
msgid "Disable comments"
msgstr "Отключить комментарии"
-#: ../../include/conversation.php:1475
+#: ../../include/conversation.php:1489
#: ../../extend/addon/hzaddons/hsse/hsse.php:216
msgid "Toggle comments"
msgstr "Переключить комментарии"
-#: ../../include/conversation.php:1482
+#: ../../include/conversation.php:1496
msgid "Summary (optional)"
msgstr "Резюме (необязательно)"
-#: ../../include/conversation.php:1485
+#: ../../include/conversation.php:1499
#: ../../extend/addon/hzaddons/hsse/hsse.php:224
msgid "Categories (optional, comma-separated list)"
msgstr "Категории (необязательно, список через запятую)"
-#: ../../include/conversation.php:1486
+#: ../../include/conversation.php:1500
#: ../../extend/addon/hzaddons/hsse/hsse.php:225
msgid "Permission settings"
msgstr "Настройки разрешений"
-#: ../../include/conversation.php:1508
+#: ../../include/conversation.php:1522
#: ../../extend/addon/hzaddons/hsse/hsse.php:247
msgid "Other networks and post services"
msgstr "Другие сети и службы публикаций"
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1525
#: ../../extend/addon/hzaddons/hsse/hsse.php:250
#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:209
msgid "Set expiration date"
msgstr "Установить срок действия"
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1528
#: ../../extend/addon/hzaddons/hsse/hsse.php:253
msgid "Set publish date"
msgstr "Установить дату публикации"
-#: ../../include/conversation.php:1760
+#: ../../include/conversation.php:1774
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
@@ -10946,7 +11124,7 @@ msgstr[0] "Посетит"
msgstr[1] "Посетят"
msgstr[2] "Посетят"
-#: ../../include/conversation.php:1763
+#: ../../include/conversation.php:1777
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
@@ -10954,13 +11132,13 @@ msgstr[0] "Не посетит"
msgstr[1] "Не посетят"
msgstr[2] "Не посетят"
-#: ../../include/conversation.php:1766
+#: ../../include/conversation.php:1780
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr "Не решил"
-#: ../../include/conversation.php:1769
+#: ../../include/conversation.php:1783
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
@@ -10968,7 +11146,7 @@ msgstr[0] "Согласен"
msgstr[1] "Согласны"
msgstr[2] "Согласны"
-#: ../../include/conversation.php:1772
+#: ../../include/conversation.php:1786
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
@@ -10976,7 +11154,7 @@ msgstr[0] "Не согласен"
msgstr[1] "Не согласны"
msgstr[2] "Не согласны"
-#: ../../include/conversation.php:1775
+#: ../../include/conversation.php:1789
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -11035,6 +11213,10 @@ msgstr "Здесь нет ничего нового"
msgid "Rate This Channel (this is public)"
msgstr "Оценкa этoго канала (общедоступно)"
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr "Оценка"
+
#: ../../include/js_strings.php:21
msgid "Describe (optional)"
msgstr "Охарактеризовать (необязательно)"
@@ -11185,19 +11367,19 @@ msgstr " "
msgid "timeago.numbers"
msgstr ""
-#: ../../include/js_strings.php:74 ../../include/text.php:1481
+#: ../../include/js_strings.php:74 ../../include/text.php:1478
msgid "January"
msgstr "Январь"
-#: ../../include/js_strings.php:75 ../../include/text.php:1481
+#: ../../include/js_strings.php:75 ../../include/text.php:1478
msgid "February"
msgstr "Февраль"
-#: ../../include/js_strings.php:76 ../../include/text.php:1481
+#: ../../include/js_strings.php:76 ../../include/text.php:1478
msgid "March"
msgstr "Март"
-#: ../../include/js_strings.php:77 ../../include/text.php:1481
+#: ../../include/js_strings.php:77 ../../include/text.php:1478
msgid "April"
msgstr "Апрель"
@@ -11206,31 +11388,31 @@ msgctxt "long"
msgid "May"
msgstr "Май"
-#: ../../include/js_strings.php:79 ../../include/text.php:1481
+#: ../../include/js_strings.php:79 ../../include/text.php:1478
msgid "June"
msgstr "Июнь"
-#: ../../include/js_strings.php:80 ../../include/text.php:1481
+#: ../../include/js_strings.php:80 ../../include/text.php:1478
msgid "July"
msgstr "Июль"
-#: ../../include/js_strings.php:81 ../../include/text.php:1481
+#: ../../include/js_strings.php:81 ../../include/text.php:1478
msgid "August"
msgstr "Август"
-#: ../../include/js_strings.php:82 ../../include/text.php:1481
+#: ../../include/js_strings.php:82 ../../include/text.php:1478
msgid "September"
msgstr "Сентябрь"
-#: ../../include/js_strings.php:83 ../../include/text.php:1481
+#: ../../include/js_strings.php:83 ../../include/text.php:1478
msgid "October"
msgstr "Октябрь"
-#: ../../include/js_strings.php:84 ../../include/text.php:1481
+#: ../../include/js_strings.php:84 ../../include/text.php:1478
msgid "November"
msgstr "Ноябрь"
-#: ../../include/js_strings.php:85 ../../include/text.php:1481
+#: ../../include/js_strings.php:85 ../../include/text.php:1478
msgid "December"
msgstr "Декабрь"
@@ -11283,31 +11465,31 @@ msgstr "Ноя"
msgid "Dec"
msgstr "Дек"
-#: ../../include/js_strings.php:98 ../../include/text.php:1477
+#: ../../include/js_strings.php:98 ../../include/text.php:1474
msgid "Sunday"
msgstr "Воскресенье"
-#: ../../include/js_strings.php:99 ../../include/text.php:1477
+#: ../../include/js_strings.php:99 ../../include/text.php:1474
msgid "Monday"
msgstr "Понедельник"
-#: ../../include/js_strings.php:100 ../../include/text.php:1477
+#: ../../include/js_strings.php:100 ../../include/text.php:1474
msgid "Tuesday"
msgstr "Вторник"
-#: ../../include/js_strings.php:101 ../../include/text.php:1477
+#: ../../include/js_strings.php:101 ../../include/text.php:1474
msgid "Wednesday"
msgstr "Среда"
-#: ../../include/js_strings.php:102 ../../include/text.php:1477
+#: ../../include/js_strings.php:102 ../../include/text.php:1474
msgid "Thursday"
msgstr "Четверг"
-#: ../../include/js_strings.php:103 ../../include/text.php:1477
+#: ../../include/js_strings.php:103 ../../include/text.php:1474
msgid "Friday"
msgstr "Пятница"
-#: ../../include/js_strings.php:104 ../../include/text.php:1477
+#: ../../include/js_strings.php:104 ../../include/text.php:1474
msgid "Saturday"
msgstr "Суббота"
@@ -11642,8 +11824,8 @@ msgid "Ability to create multiple profiles"
msgstr "Возможность создания нескольких профилей"
#: ../../include/selectors.php:18
-msgid "Profile to assign new connections"
-msgstr "Назначить профиль для новых контактов"
+msgid "Select a profile to assign to this contact"
+msgstr "Выберите профиль для этого контакта"
#: ../../include/selectors.php:41
msgid "Frequently"
@@ -11881,67 +12063,72 @@ msgstr "Спроси меня"
msgid "(Unknown)"
msgstr "(Неизвестный)"
-#: ../../include/items.php:1243
+#: ../../include/items.php:1246
msgid "Visible to anybody on the internet."
msgstr "Виден всем в интернете."
-#: ../../include/items.php:1245
+#: ../../include/items.php:1248
msgid "Visible to you only."
msgstr "Видно только вам."
-#: ../../include/items.php:1247
+#: ../../include/items.php:1250
msgid "Visible to anybody in this network."
msgstr "Видно всем в этой сети."
-#: ../../include/items.php:1249
+#: ../../include/items.php:1252
msgid "Visible to anybody authenticated."
msgstr "Видно всем аутентифицированным."
-#: ../../include/items.php:1251
+#: ../../include/items.php:1254
#, php-format
msgid "Visible to anybody on %s."
msgstr "Видно всем в %s."
-#: ../../include/items.php:1253
+#: ../../include/items.php:1256
msgid "Visible to all connections."
msgstr "Видно всем контактам."
-#: ../../include/items.php:1255
+#: ../../include/items.php:1258
msgid "Visible to approved connections."
msgstr "Видно только одобренным контактам."
-#: ../../include/items.php:1257
+#: ../../include/items.php:1260
msgid "Visible to specific connections."
msgstr "Видно указанным контактам."
-#: ../../include/items.php:4265
+#: ../../include/items.php:4397
msgid "Privacy group is empty."
msgstr "Группа конфиденциальности пуста"
-#: ../../include/items.php:4272
+#: ../../include/items.php:4404
#, php-format
msgid "Privacy group: %s"
msgstr "Группа конфиденциальности: %s"
-#: ../../include/items.php:4284
+#: ../../include/items.php:4414
+#, php-format
+msgid "Connection: %s"
+msgstr "Контакт: %s"
+
+#: ../../include/items.php:4416
msgid "Connection not found."
msgstr "Контакт не найден."
-#: ../../include/items.php:4637
+#: ../../include/items.php:4769
msgid "profile photo"
msgstr "Фотография профиля"
-#: ../../include/items.php:4829
+#: ../../include/items.php:4961
#, php-format
msgid "[Edited %s]"
msgstr "[Отредактировано %s]"
-#: ../../include/items.php:4829
+#: ../../include/items.php:4961
msgctxt "edit_activity"
msgid "Post"
msgstr "Публикация"
-#: ../../include/items.php:4829
+#: ../../include/items.php:4961
msgctxt "edit_activity"
msgid "Comment"
msgstr "Комментарий"
@@ -12064,11 +12251,11 @@ msgid "MySpace"
msgstr ""
#: ../../include/bbcode.php:233 ../../include/bbcode.php:928
-#: ../../include/bbcode.php:1552 ../../include/bbcode.php:1560
+#: ../../include/bbcode.php:1549 ../../include/bbcode.php:1557
msgid "Image/photo"
msgstr "Изображение / фотография"
-#: ../../include/bbcode.php:280 ../../include/bbcode.php:1577
+#: ../../include/bbcode.php:280 ../../include/bbcode.php:1574
msgid "Encrypted content"
msgstr "Зашифрованное содержание"
@@ -12113,11 +12300,11 @@ msgstr "Просмотр статьи"
msgid "View summary"
msgstr "Просмотр резюме"
-#: ../../include/bbcode.php:1528
+#: ../../include/bbcode.php:1525
msgid "$1 wrote:"
msgstr "$1 писал:"
-#: ../../include/security.php:607
+#: ../../include/security.php:625
msgid ""
"The form security token was not correct. This probably happened because the "
"form has been opened for too long (>3 hours) before submitting it."
@@ -12246,311 +12433,325 @@ msgid ""
"permissions set who is allowed to view the post."
msgstr "Разрешения публикации %s не могут быть изменены %s после того, как ею поделились. Эти разрешения устанавливают кому разрешено просматривать эту публикацию."
-#: ../../include/text.php:524
+#: ../../include/text.php:525
msgid "prev"
msgstr "предыдущий"
-#: ../../include/text.php:526
+#: ../../include/text.php:527
msgid "first"
msgstr "первый"
-#: ../../include/text.php:555
+#: ../../include/text.php:556
msgid "last"
msgstr "последний"
-#: ../../include/text.php:558
+#: ../../include/text.php:559
msgid "next"
msgstr "следующий"
-#: ../../include/text.php:576
+#: ../../include/text.php:577
msgid "older"
msgstr "старше"
-#: ../../include/text.php:578
+#: ../../include/text.php:579
msgid "newer"
msgstr "новее"
-#: ../../include/text.php:1019
+#: ../../include/text.php:1016
msgid "No connections"
msgstr "Нет контактов"
-#: ../../include/text.php:1071
+#: ../../include/text.php:1068
#, php-format
msgid "View all %s connections"
msgstr "Просмотреть все %s контактов"
-#: ../../include/text.php:1134
+#: ../../include/text.php:1131
#, php-format
msgid "Network: %s"
msgstr "Сеть: %s"
-#: ../../include/text.php:1237 ../../include/text.php:1241
+#: ../../include/text.php:1234 ../../include/text.php:1238
msgid "poke"
msgstr "Ткнуть"
-#: ../../include/text.php:1242
+#: ../../include/text.php:1239
msgid "ping"
msgstr "Пингануть"
-#: ../../include/text.php:1242
+#: ../../include/text.php:1239
msgid "pinged"
msgstr "Отпингован"
-#: ../../include/text.php:1243
+#: ../../include/text.php:1240
msgid "prod"
msgstr "Подтолкнуть"
-#: ../../include/text.php:1243
+#: ../../include/text.php:1240
msgid "prodded"
msgstr "Подтолкнут"
-#: ../../include/text.php:1244
+#: ../../include/text.php:1241
msgid "slap"
msgstr "Шлёпнуть"
-#: ../../include/text.php:1244
+#: ../../include/text.php:1241
msgid "slapped"
msgstr "Шлёпнут"
-#: ../../include/text.php:1245
+#: ../../include/text.php:1242
msgid "finger"
msgstr "Указать"
-#: ../../include/text.php:1245
+#: ../../include/text.php:1242
msgid "fingered"
msgstr "Указан"
-#: ../../include/text.php:1246
+#: ../../include/text.php:1243
msgid "rebuff"
msgstr "Дать отпор"
-#: ../../include/text.php:1246
+#: ../../include/text.php:1243
msgid "rebuffed"
msgstr "Дан отпор"
-#: ../../include/text.php:1269
+#: ../../include/text.php:1266
msgid "happy"
msgstr "счастливый"
-#: ../../include/text.php:1270
+#: ../../include/text.php:1267
msgid "sad"
msgstr "грустный"
-#: ../../include/text.php:1271
+#: ../../include/text.php:1268
msgid "mellow"
msgstr "спокойный"
-#: ../../include/text.php:1272
+#: ../../include/text.php:1269
msgid "tired"
msgstr "усталый"
-#: ../../include/text.php:1273
+#: ../../include/text.php:1270
msgid "perky"
msgstr "весёлый"
-#: ../../include/text.php:1274
+#: ../../include/text.php:1271
msgid "angry"
msgstr "сердитый"
-#: ../../include/text.php:1275
+#: ../../include/text.php:1272
msgid "stupefied"
msgstr "отупевший"
-#: ../../include/text.php:1276
+#: ../../include/text.php:1273
msgid "puzzled"
msgstr "недоумевающий"
-#: ../../include/text.php:1277
+#: ../../include/text.php:1274
msgid "interested"
msgstr "заинтересованный"
-#: ../../include/text.php:1278
+#: ../../include/text.php:1275
msgid "bitter"
msgstr "едкий"
-#: ../../include/text.php:1279
+#: ../../include/text.php:1276
msgid "cheerful"
msgstr "бодрый"
-#: ../../include/text.php:1280
+#: ../../include/text.php:1277
msgid "alive"
msgstr "энергичный"
-#: ../../include/text.php:1281
+#: ../../include/text.php:1278
msgid "annoyed"
msgstr "раздражённый"
-#: ../../include/text.php:1282
+#: ../../include/text.php:1279
msgid "anxious"
msgstr "обеспокоенный"
-#: ../../include/text.php:1283
+#: ../../include/text.php:1280
msgid "cranky"
msgstr "капризный"
-#: ../../include/text.php:1284
+#: ../../include/text.php:1281
msgid "disturbed"
msgstr "встревоженный"
-#: ../../include/text.php:1285
+#: ../../include/text.php:1282
msgid "frustrated"
msgstr "разочарованный"
-#: ../../include/text.php:1286
+#: ../../include/text.php:1283
msgid "depressed"
msgstr "подавленный"
-#: ../../include/text.php:1287
+#: ../../include/text.php:1284
msgid "motivated"
msgstr "мотивированный"
-#: ../../include/text.php:1288
+#: ../../include/text.php:1285
msgid "relaxed"
msgstr "расслабленный"
-#: ../../include/text.php:1289
+#: ../../include/text.php:1286
msgid "surprised"
msgstr "удивленный"
-#: ../../include/text.php:1481
+#: ../../include/text.php:1478
msgid "May"
msgstr "Май"
-#: ../../include/text.php:1539
+#: ../../include/text.php:1536
msgid "Unknown Attachment"
msgstr "Неизвестное вложение"
-#: ../../include/text.php:1582
+#: ../../include/text.php:1579
msgid "remove category"
msgstr "удалить категорию"
-#: ../../include/text.php:1659
+#: ../../include/text.php:1656
msgid "remove from file"
msgstr "удалить из файла"
-#: ../../include/text.php:1842
+#: ../../include/text.php:1840
#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:401
msgid "Download binary/encrypted content"
msgstr "Загрузить двоичное / зашифрованное содержимое"
-#: ../../include/text.php:1913
-msgid "Poll has ended."
-msgstr "Опрос окончен."
+#: ../../include/text.php:1914 ../../include/text.php:1923
+#, php-format
+msgctxt "noun"
+msgid "%d Vote"
+msgid_plural "%d Votes"
+msgstr[0] ""
+
+#: ../../include/text.php:1930
+#, php-format
+msgctxt "noun"
+msgid "%d Vote in total"
+msgid_plural "%d Votes in total"
+msgstr[0] ""
+
+#: ../../include/text.php:1936
+msgid "Poll has ended"
+msgstr "Опрос завершён"
-#: ../../include/text.php:1916
+#: ../../include/text.php:1939
#, php-format
-msgid "Poll ends: %s"
+msgid "Poll ends in %s"
msgstr "Опрос заканчивается %s"
-#: ../../include/text.php:2073
+#: ../../include/text.php:2101
msgid "Link to Source"
msgstr "Ссылка на источник"
-#: ../../include/text.php:2103
+#: ../../include/text.php:2131
msgid "Page layout"
msgstr "Шаблон страницы"
-#: ../../include/text.php:2103
+#: ../../include/text.php:2131
msgid "You can create your own with the layouts tool"
msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов"
-#: ../../include/text.php:2114
+#: ../../include/text.php:2142
msgid "HTML"
msgstr ""
-#: ../../include/text.php:2117
+#: ../../include/text.php:2145
msgid "Comanche Layout"
msgstr "Шаблон Comanche"
-#: ../../include/text.php:2122
+#: ../../include/text.php:2150
msgid "PHP"
msgstr ""
-#: ../../include/text.php:2131
+#: ../../include/text.php:2159
msgid "Page content type"
msgstr "Тип содержимого страницы"
-#: ../../include/text.php:2264
+#: ../../include/text.php:2292
msgid "activity"
msgstr "активность"
-#: ../../include/text.php:2267
+#: ../../include/text.php:2295
msgid "poll"
msgstr "голосование"
-#: ../../include/text.php:2380
+#: ../../include/text.php:2408
msgid "a-z, 0-9, -, and _ only"
msgstr "Только a-z, 0-9, -, и _"
-#: ../../include/text.php:2685
+#: ../../include/text.php:2713
msgid "Design Tools"
msgstr "Инструменты дизайна"
-#: ../../include/text.php:2691
+#: ../../include/text.php:2719
msgid "Pages"
msgstr "Страницы"
-#: ../../include/text.php:2703
+#: ../../include/text.php:2731
msgid "Import"
msgstr "Импортировать"
-#: ../../include/text.php:2704
+#: ../../include/text.php:2732
msgid "Import website..."
msgstr "Импорт веб-сайта..."
-#: ../../include/text.php:2705
+#: ../../include/text.php:2733
msgid "Select folder to import"
msgstr "Выбрать каталог для импорта"
-#: ../../include/text.php:2706
+#: ../../include/text.php:2734
msgid "Import from a zipped folder:"
msgstr "Импортировать из каталога в zip-архиве:"
-#: ../../include/text.php:2707
+#: ../../include/text.php:2735
msgid "Import from cloud files:"
msgstr "Импортировать из сетевых файлов:"
-#: ../../include/text.php:2708
+#: ../../include/text.php:2736
msgid "/cloud/channel/path/to/folder"
msgstr ""
-#: ../../include/text.php:2709
+#: ../../include/text.php:2737
msgid "Enter path to website files"
msgstr "Введите путь к файлам веб-сайта"
-#: ../../include/text.php:2710
+#: ../../include/text.php:2738
msgid "Select folder"
msgstr "Выбрать каталог"
-#: ../../include/text.php:2711
+#: ../../include/text.php:2739
msgid "Export website..."
msgstr "Экспорт веб-сайта..."
-#: ../../include/text.php:2712
+#: ../../include/text.php:2740
msgid "Export to a zip file"
msgstr "Экспортировать в ZIP файл."
-#: ../../include/text.php:2713
+#: ../../include/text.php:2741
msgid "website.zip"
msgstr ""
-#: ../../include/text.php:2714
+#: ../../include/text.php:2742
msgid "Enter a name for the zip file."
msgstr "Введите имя для ZIP файла."
-#: ../../include/text.php:2715
+#: ../../include/text.php:2743
msgid "Export to cloud files"
msgstr "Эскпортировать в сетевые файлы:"
-#: ../../include/text.php:2716
+#: ../../include/text.php:2744
msgid "/path/to/export/folder"
msgstr ""
-#: ../../include/text.php:2717
+#: ../../include/text.php:2745
msgid "Enter a path to a cloud files destination."
msgstr "Введите путь к расположению сетевых файлов."
-#: ../../include/text.php:2718
+#: ../../include/text.php:2746
msgid "Specify folder"
msgstr "Указать каталог"
@@ -12609,7 +12810,7 @@ msgid ""
msgstr "Не удалось создать дублирующийся идентификатор канала. Импорт невозможен."
#: ../../include/import.php:77
-#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:44
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:43
msgid "Unable to create a unique channel address. Import failed."
msgstr "Не удалось создать уникальный адрес канала. Импорт не завершен."
@@ -12695,8 +12896,8 @@ msgid "Set shadow depth of photos"
msgstr "Глубина теней фотографий"
#: ../../view/theme/redbasic/php/config.php:113
-msgid "Set maximum width of content region in pixel"
-msgstr "Максимальная ширина содержания региона (в пикселях)"
+msgid "Set maximum width of content region in rem"
+msgstr "Установить максимальную ширину содержимого в rem"
#: ../../view/theme/redbasic/php/config.php:113
msgid "Leave empty for default width"
@@ -13073,7 +13274,7 @@ msgstr "Настройки Gravatar обновлены."
#: ../../extend/addon/hzaddons/cart/widgets/catalogitem.php:57
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:263
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:659
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:660
msgid "Price"
msgstr "Цена"
@@ -13147,27 +13348,27 @@ msgid "Enable Manual Cart Module"
msgstr "Включить модуль ручного управления карточками"
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:172
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:163
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:164
msgid "New Sku"
msgstr "Новый код"
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:208
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:198
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:199
msgid "Cannot save edits to locked item."
msgstr "Невозможно сохранить изменения заблокированной позиции."
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:252
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:648
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:649
msgid "Changes Locked"
msgstr "Изменения заблокированы"
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:256
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:652
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:653
msgid "Item available for purchase."
msgstr "Позиция доступна для приобретения."
#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:266
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:662
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:663
msgid "Photo URL"
msgstr "URL изображения"
@@ -13189,47 +13390,47 @@ msgstr "Метка"
msgid "Instructions"
msgstr "Инструкции"
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:64
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:65
msgid "Enable Hubzilla Services Module"
msgstr "Включить модуль сервиса Hubzilla"
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:247
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:334
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:248
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:335
msgid "SKU not found."
msgstr "Код не найден."
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:300
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:304
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:301
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:305
msgid "Invalid Activation Directive."
msgstr "Недействительная директива активации."
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:375
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:379
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:376
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:380
msgid "Invalid Deactivation Directive."
msgstr "Недействительная директива деактивации"
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:565
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:566
msgid "Add to this privacy group"
msgstr "Добавить в эту группу конфиденциальности"
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:581
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:582
msgid "Set user service class"
msgstr "Установить класс обслуживания пользователя"
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:608
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:609
msgid "You must be using a local account to purchase this service."
msgstr "Вы должны использовать локальную учётноую запись для покупки этого сервиса."
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:666
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:667
msgid "Add buyer to privacy group"
msgstr "Добавить покупателя в группу конфиденциальности"
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:671
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:672
msgid "Add buyer as connection"
msgstr "Добавить покупателя как контакт"
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:679
-#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:721
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:680
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:722
msgid "Set Service Class"
msgstr "Установить класс обслуживания"
@@ -14264,11 +14465,11 @@ msgstr "Отслеживаемые теги (через запятую, искл
msgid "Diaspora Protocol"
msgstr "Протокол Diaspora"
-#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:19
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:18
msgid "No username found in import file."
msgstr "Имя пользователя не найдено в файле для импорта."
-#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:142
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:140
msgid "Import completed."
msgstr "Импорт завершен."
@@ -14294,7 +14495,7 @@ msgstr "Адрес пересылки Diaspora. Например: relay@diaspora
msgid "Diaspora relay could not be imported"
msgstr "Невозможно импортировать адрес пересылки Diaspora"
-#: ../../extend/addon/hzaddons/diaspora/diaspora.php:1015
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:1027
msgid "No subject"
msgstr "Без темы"
@@ -14576,12 +14777,12 @@ msgstr "Импорт файлового хранилища Redmatrix"
msgid "This will import all your Redmatrix cloud files to this channel."
msgstr "Это позволит импортировать все ваши файлы в Redmatrix в этот канал."
-#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:30
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:32
msgid "OpenID protocol error. No ID returned."
msgstr "Ошибка протокола OpenID. Идентификатор не возвращён."
-#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:76
-#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:178
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:78
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:179
#, php-format
msgid "Welcome %s. Remote authentication successful."
msgstr "Добро пожаловать %s. Удаленная аутентификация успешно завершена."