diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/js_strings.php | 19 | ||||
| -rw-r--r-- | include/language.php | 26 | ||||
| -rwxr-xr-x | include/plugin.php | 5 | ||||
| -rw-r--r-- | util/po2php.php | 5 | ||||
| -rw-r--r-- | view/js/main.js | 41 | ||||
| -rw-r--r-- | view/ru/hmessages.po | 391 | ||||
| -rw-r--r-- | view/ru/hstrings.php | 45 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 2 |
9 files changed, 306 insertions, 230 deletions
@@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.9' ); +define ( 'STD_VERSION', '3.9.2' ); define ( 'ZOT_REVISION', '6.0a' ); diff --git a/include/js_strings.php b/include/js_strings.php index d9038e838..c053e5666 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -38,6 +38,15 @@ function js_strings() { // using the defaults set below if left untranslated, empty strings if // translated to "NONE" and the corresponding language strings // if translated to anything else + 'minutes' => tt('%d minutes', '%d minutes', '%d'), + 'hours' => tt('about %d hours', 'about %d hours', '%d'), + 'days' => tt('%d days', '%d days', '%d'), + 'months' => tt('%d months', '%d months', '%d'), + 'years' => tt('%d years', '%d years', '%d'), + + // get plural function code + 'plural_func' => tf(), + '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), @@ -46,15 +55,15 @@ function js_strings() { // translatable main strings for jquery.timeago '$t05' => t('less than a minute'), '$t06' => t('about a minute'), - '$t07' => t('%d minutes'), + '$t07' => ta('%d minutes'), '$t08' => t('about an hour'), - '$t09' => t('about %d hours'), + '$t09' => ta('about %d hours'), '$t10' => t('a day'), - '$t11' => t('%d days'), + '$t11' => ta('%d days'), '$t12' => t('about a month'), - '$t13' => t('%d months'), + '$t13' => ta('%d months'), '$t14' => t('about a year'), - '$t15' => t('%d years'), + '$t15' => ta('%d years'), '$t16' => t(' '), // wordSeparator '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'), diff --git a/include/language.php b/include/language.php index 69a7e3004..e9d62e434 100644 --- a/include/language.php +++ b/include/language.php @@ -255,6 +255,32 @@ function tt($singular, $plural, $count, $ctx = ''){ } /** + * @brief Return slash separated string of plurals translation forms + * + * @param string $k key in translations array + * @return string + */ +function ta($k){ + + $t = App::$strings[$k]; + if (is_array($t)) + $t = implode("/", $t); + return ($t == "" ? $k : $t); +} + +/** + * @brief Return string_plural_select_xx function code + * + * @return string + */ + +function tf() { + + $s = "plural_function_code"; + return (x(App::$strings, $s) ? App::$strings[$s] : "0"); +} + +/** * @brief Provide a fallback which will not collide with a function defined in * any language file. * diff --git a/include/plugin.php b/include/plugin.php index ce081401d..7a63cbfc1 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -1067,10 +1067,11 @@ function get_markup_template($s, $root = '') { } else { if (isset(\App::$override_markup_templates[$testroot][$s]["root"]) && isset(\App::$override_markup_templates[$testroot][$s]["file"])) { - $s = \App::$override_markup_templates[$testroot][$s]["file"]; $root = \App::$override_markup_templates[$testroot][$s]["root"]; + $s = \App::$override_markup_templates[$testroot][$s]["file"]; + $template = $t->get_markup_template($s, $root); } elseif (\App::$override_templateroot) { - $newroot = \App::$override_templateroot.$root; + $newroot = \App::$override_templateroot . $root; if ($newroot != '' && substr($newroot,-1) != '/' ) { $newroot .= '/'; } diff --git a/util/po2php.php b/util/po2php.php index 50941c062..9ffcb64c4 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -58,8 +58,9 @@ function po2php_run($argc,$argv) { $out .= 'function string_plural_select_' . $lang . '($n){'."\n"; $out .= ' return '.$cond.';'."\n"; $out .= '}}'."\n"; - - $out .= 'App::$rtl = ' . intval($rtl) ; + + $out .= 'App::$rtl = ' . intval($rtl) . ";\n" ; + $out .= 'App::$strings["plural_function_code"] = "' . str_replace("$", "", $cond) . '"'; } if ($k!="" && substr($l,0,7)=="msgstr "){ diff --git a/view/js/main.js b/view/js/main.js index 48277f5cc..085bc8d0d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -44,25 +44,28 @@ $(document).ready(function() { $(document).on('click', '.conversation-settings-link', getConversationSettings); $(document).on('click', '#settings_module_ajax_submit', postConversationSettings); - jQuery.timeago.settings.strings = { - prefixAgo : aStr['t01'], - prefixFromNow : aStr['t02'], - suffixAgo : aStr['t03'], - suffixFromNow : aStr['t04'], - seconds : aStr['t05'], - minute : aStr['t06'], - minutes : aStr['t07'], - hour : aStr['t08'], - hours : aStr['t09'], - day : aStr['t10'], - days : aStr['t11'], - month : aStr['t12'], - months : aStr['t13'], - year : aStr['t14'], - years : aStr['t15'], - wordSeparator : aStr['t16'], - numbers : aStr['t17'], - }; + var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);'); + + jQuery.timeago.settings.strings = { + prefixAgo : aStr['t01'], + prefixFromNow : aStr['t02'], + suffixAgo : aStr['t03'], + suffixFromNow : aStr['t04'], + seconds : aStr['t05'], + minute : aStr['t06'], + minutes : function(value){return tf(value, aStr['t07']);}, + hour : aStr['t08'], + hours : function(value){return tf(value, aStr['t09']);}, + day : aStr['t10'], + days : function(value){return tf(value, aStr['t11']);}, + month : aStr['t12'], + months : function(value){return tf(value, aStr['t13']);}, + year : aStr['t14'], + years : function(value){return tf(value, aStr['t15']);}, + wordSeparator : aStr['t16'], + numbers : aStr['t17'], + }; + //mod_mail only $(".mail-conv-detail .autotime").timeago(); diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index bf2f11b41..cd785137d 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-25 21:40+0200\n" -"PO-Revision-Date: 2018-10-07 13:05+0200\n" +"POT-Creation-Date: 2018-10-06 17:07+0200\n" +"PO-Revision-Date: 2018-10-12 21:32+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" @@ -25,7 +25,7 @@ msgstr "" msgid "Source channel not found." msgstr "Канал-источник не найден." -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087 #: ../../Zotlabs/Module/Admin/Site.php:187 msgid "Default" msgstr "По умолчанию" @@ -85,8 +85,8 @@ msgstr "Фокус (по умолчанию Hubzilla)" #: ../../Zotlabs/Module/Pdledit.php:107 ../../Zotlabs/Module/Wiki.php:215 #: ../../Zotlabs/Module/Import.php:565 #: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Widget/Wiki_pages.php:40 -#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Wiki_pages.php:42 +#: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Lib/ThreadItem.php:767 #: ../../extend/addon/hzaddons/dwpost/dwpost.php:89 #: ../../extend/addon/hzaddons/fuzzloc/fuzzloc.php:191 @@ -673,7 +673,7 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Item.php:229 ../../Zotlabs/Module/Item.php:248 #: ../../Zotlabs/Module/Item.php:258 ../../Zotlabs/Module/Item.php:1110 #: ../../Zotlabs/Module/Achievements.php:34 -#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Poke.php:157 +#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Profiles.php:198 #: ../../Zotlabs/Module/Profiles.php:635 ../../Zotlabs/Module/Photos.php:69 @@ -721,8 +721,8 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Invite.php:21 #: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Articles.php:80 #: ../../Zotlabs/Module/Cloud.php:40 ../../Zotlabs/Module/Pdledit.php:34 -#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:282 -#: ../../Zotlabs/Module/Wiki.php:415 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 +#: ../../Zotlabs/Module/Wiki.php:429 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Cards.php:81 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Web/WebServer.php:123 @@ -892,7 +892,7 @@ msgstr "Просмотреть все %d общих контактов" #: ../../Zotlabs/Module/Connections.php:342 #: ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Article_edit.php:99 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:385 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Widget/Cdav.php:126 #: ../../Zotlabs/Widget/Cdav.php:162 ../../Zotlabs/Lib/Apps.php:534 #: ../../Zotlabs/Lib/ThreadItem.php:130 @@ -1255,7 +1255,7 @@ msgid "Visible to specific connections." msgstr "Видно указанным контактам." #: ../../include/items.php:3587 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Display.php:452 ../../Zotlabs/Module/Admin.php:62 #: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Viewsrc.php:25 #: ../../Zotlabs/Module/Admin/Addons.php:259 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 @@ -1874,47 +1874,47 @@ msgstr "расслабленный" msgid "surprised" msgstr "удивленный" -#: ../../include/text.php:1377 ../../include/js_strings.php:86 +#: ../../include/text.php:1377 ../../include/js_strings.php:93 msgid "Monday" msgstr "Понедельник" -#: ../../include/text.php:1377 ../../include/js_strings.php:87 +#: ../../include/text.php:1377 ../../include/js_strings.php:94 msgid "Tuesday" msgstr "Вторник" -#: ../../include/text.php:1377 ../../include/js_strings.php:88 +#: ../../include/text.php:1377 ../../include/js_strings.php:95 msgid "Wednesday" msgstr "Среда" -#: ../../include/text.php:1377 ../../include/js_strings.php:89 +#: ../../include/text.php:1377 ../../include/js_strings.php:96 msgid "Thursday" msgstr "Четверг" -#: ../../include/text.php:1377 ../../include/js_strings.php:90 +#: ../../include/text.php:1377 ../../include/js_strings.php:97 msgid "Friday" msgstr "Пятница" -#: ../../include/text.php:1377 ../../include/js_strings.php:91 +#: ../../include/text.php:1377 ../../include/js_strings.php:98 msgid "Saturday" msgstr "Суббота" -#: ../../include/text.php:1377 ../../include/js_strings.php:85 +#: ../../include/text.php:1377 ../../include/js_strings.php:92 msgid "Sunday" msgstr "Воскресенье" -#: ../../include/text.php:1381 ../../include/js_strings.php:61 +#: ../../include/text.php:1381 ../../include/js_strings.php:68 msgid "January" msgstr "Январь" -#: ../../include/text.php:1381 ../../include/js_strings.php:62 +#: ../../include/text.php:1381 ../../include/js_strings.php:69 msgid "February" msgstr "Февраль" -#: ../../include/text.php:1381 ../../include/js_strings.php:63 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "March" msgstr "Март" -#: ../../include/text.php:1381 ../../include/js_strings.php:64 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "April" msgstr "Апрель" @@ -1922,31 +1922,31 @@ msgstr "Апрель" msgid "May" msgstr "Май" -#: ../../include/text.php:1381 ../../include/js_strings.php:66 +#: ../../include/text.php:1381 ../../include/js_strings.php:73 msgid "June" msgstr "Июнь" -#: ../../include/text.php:1381 ../../include/js_strings.php:67 +#: ../../include/text.php:1381 ../../include/js_strings.php:74 msgid "July" msgstr "Июль" -#: ../../include/text.php:1381 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:75 msgid "August" msgstr "Август" -#: ../../include/text.php:1381 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:76 msgid "September" msgstr "Сентябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:77 msgid "October" msgstr "Октябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:78 msgid "November" msgstr "Ноябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:72 +#: ../../include/text.php:1381 ../../include/js_strings.php:79 msgid "December" msgstr "Декабрь" @@ -1989,8 +1989,8 @@ msgid "You can create your own with the layouts tool" msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов" #: ../../include/text.php:1890 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:359 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 +#: ../../Zotlabs/Module/Wiki.php:372 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 msgid "BBcode" msgstr "" @@ -1999,15 +1999,15 @@ msgid "HTML" msgstr "" #: ../../include/text.php:1892 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:359 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 +#: ../../Zotlabs/Module/Wiki.php:372 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 #: ../../extend/addon/hzaddons/mdpost/mdpost.php:41 msgid "Markdown" msgstr "Разметка Markdown" #: ../../include/text.php:1893 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 msgid "Text" msgstr "Текст" @@ -2342,7 +2342,7 @@ msgstr "Не найдено" #: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:140 #: ../../Zotlabs/Module/Display.php:157 ../../Zotlabs/Module/Display.php:174 #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Web/Router.php:185 ../../Zotlabs/Lib/NativeWikiPage.php:519 +#: ../../Zotlabs/Web/Router.php:185 ../../Zotlabs/Lib/NativeWikiPage.php:521 msgid "Page not found." msgstr "Страница не найдена." @@ -2418,7 +2418,7 @@ msgid "View summary" msgstr "Просмотр резюме" #: ../../include/bbcode.php:746 ../../include/bbcode.php:916 -#: ../../Zotlabs/Lib/NativeWikiPage.php:600 +#: ../../Zotlabs/Lib/NativeWikiPage.php:603 msgid "Different viewers will see this text differently" msgstr "Различные зрители увидят этот текст по-разному" @@ -2756,13 +2756,13 @@ msgid "Where are you right now?" msgstr "Где вы сейчас?" #: ../../include/conversation.php:1342 ../../Zotlabs/Module/Cover_photo.php:401 -#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:390 +#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:404 #: ../../extend/addon/hzaddons/hsse/hsse.php:139 msgid "Choose images to embed" msgstr "Выбрать изображения для встраивания" #: ../../include/conversation.php:1343 ../../Zotlabs/Module/Cover_photo.php:402 -#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:391 +#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:405 #: ../../extend/addon/hzaddons/hsse/hsse.php:140 msgid "Choose an album" msgstr "Выбрать альбом" @@ -2773,19 +2773,19 @@ msgid "Choose a different album..." msgstr "Выбрать другой альбом..." #: ../../include/conversation.php:1345 ../../Zotlabs/Module/Cover_photo.php:404 -#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:407 #: ../../extend/addon/hzaddons/hsse/hsse.php:142 msgid "Error getting album list" msgstr "Ошибка получения списка альбомов" #: ../../include/conversation.php:1346 ../../Zotlabs/Module/Cover_photo.php:405 -#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:394 +#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:408 #: ../../extend/addon/hzaddons/hsse/hsse.php:143 msgid "Error getting photo link" msgstr "Ошибка получения ссылки на фотографию" #: ../../include/conversation.php:1347 ../../Zotlabs/Module/Cover_photo.php:406 -#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:395 +#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:409 #: ../../extend/addon/hzaddons/hsse/hsse.php:144 msgid "Error getting album" msgstr "Ошибка получения альбома" @@ -2809,7 +2809,7 @@ msgstr "Предварительный просмотр" #: ../../include/conversation.php:1389 ../../Zotlabs/Module/Photos.php:1104 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Blocks.php:161 -#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Widget/Cdav.php:124 #: ../../extend/addon/hzaddons/hsse/hsse.php:186 msgid "Share" @@ -2855,7 +2855,7 @@ msgstr "Код" msgid "Attach/Upload file" msgstr "Прикрепить/загрузить файл" -#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:387 +#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:401 #: ../../extend/addon/hzaddons/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "Встроить изображение из ваших альбомов" @@ -2874,8 +2874,8 @@ msgstr "Встроить изображение из ваших альбомов #: ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Connedit.php:925 #: ../../Zotlabs/Module/Card_edit.php:131 -#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:356 -#: ../../Zotlabs/Module/Wiki.php:388 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:369 +#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Filer.php:55 #: ../../extend/addon/hzaddons/hsse/hsse.php:209 #: ../../extend/addon/hzaddons/hsse/hsse.php:258 msgid "Cancel" @@ -2883,7 +2883,7 @@ msgstr "Отменить" #: ../../include/conversation.php:1413 ../../include/conversation.php:1460 #: ../../Zotlabs/Module/Cover_photo.php:400 -#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:403 #: ../../extend/addon/hzaddons/hsse/hsse.php:210 #: ../../extend/addon/hzaddons/hsse/hsse.php:257 msgid "OK" @@ -3180,182 +3180,197 @@ msgstr "Это " msgid " channel name" msgstr " название канала" -#: ../../include/js_strings.php:41 +#: ../../include/js_strings.php:42 ../../include/js_strings.php:56 +#, php-format +msgid "%d minutes" +msgid_plural "%d minutes" +msgstr[0] "%d минуту" +msgstr[1] "%d минуты" +msgstr[2] "%d минут" + +#: ../../include/js_strings.php:43 ../../include/js_strings.php:58 +#, php-format +msgid "about %d hours" +msgid_plural "about %d hours" +msgstr[0] "около %d часa" +msgstr[1] "около %d часов" +msgstr[2] "около %d часов" + +#: ../../include/js_strings.php:44 ../../include/js_strings.php:60 +#, php-format +msgid "%d days" +msgid_plural "%d days" +msgstr[0] "%d день" +msgstr[1] "%d дня" +msgstr[2] "%d дней" + +#: ../../include/js_strings.php:45 ../../include/js_strings.php:62 +#, php-format +msgid "%d months" +msgid_plural "%d months" +msgstr[0] "%d месяц" +msgstr[1] "%d месяца" +msgstr[2] "%d месяцев" + +#: ../../include/js_strings.php:46 ../../include/js_strings.php:64 +#, php-format +msgid "%d years" +msgid_plural "%d years" +msgstr[0] "%d год" +msgstr[1] "%d года" +msgstr[2] "%d лет" + +#: ../../include/js_strings.php:48 msgid "timeago.prefixAgo" msgstr "" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:49 msgid "timeago.prefixFromNow" -msgstr "" +msgstr "через" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:50 msgid "timeago.suffixAgo" msgstr "назад" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:51 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:54 msgid "less than a minute" msgstr "менее чем одну минуту" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:55 msgid "about a minute" msgstr "около минуты" -#: ../../include/js_strings.php:49 -#, php-format -msgid "%d minutes" -msgstr "%d минут" - -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:57 msgid "about an hour" msgstr "около часа" -#: ../../include/js_strings.php:51 -#, php-format -msgid "about %d hours" -msgstr "около %d часов" - -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:59 msgid "a day" msgstr "день" -#: ../../include/js_strings.php:53 -#, php-format -msgid "%d days" -msgstr "%d дней" - -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:61 msgid "about a month" msgstr "около месяца" -#: ../../include/js_strings.php:55 -#, php-format -msgid "%d months" -msgstr "%d месяцев" - -#: ../../include/js_strings.php:56 +#: ../../include/js_strings.php:63 msgid "about a year" msgstr "около года" -#: ../../include/js_strings.php:57 -#, php-format -msgid "%d years" -msgstr "%d лет" - -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:65 msgid " " msgstr " " -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:66 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:72 msgctxt "long" msgid "May" msgstr "Май" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:80 msgid "Jan" msgstr "Янв" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:81 msgid "Feb" msgstr "Фев" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:82 msgid "Mar" msgstr "Мар" -#: ../../include/js_strings.php:76 +#: ../../include/js_strings.php:83 msgid "Apr" msgstr "Апр" -#: ../../include/js_strings.php:77 +#: ../../include/js_strings.php:84 msgctxt "short" msgid "May" msgstr "Май" -#: ../../include/js_strings.php:78 +#: ../../include/js_strings.php:85 msgid "Jun" msgstr "Июн" -#: ../../include/js_strings.php:79 +#: ../../include/js_strings.php:86 msgid "Jul" msgstr "Июл" -#: ../../include/js_strings.php:80 +#: ../../include/js_strings.php:87 msgid "Aug" msgstr "Авг" -#: ../../include/js_strings.php:81 +#: ../../include/js_strings.php:88 msgid "Sep" msgstr "Сен" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:89 msgid "Oct" msgstr "Окт" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:90 msgid "Nov" msgstr "Ноя" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:91 msgid "Dec" msgstr "Дек" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:99 msgid "Sun" msgstr "Вск" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:100 msgid "Mon" msgstr "Пон" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:101 msgid "Tue" msgstr "Вт" -#: ../../include/js_strings.php:95 +#: ../../include/js_strings.php:102 msgid "Wed" msgstr "Ср" -#: ../../include/js_strings.php:96 +#: ../../include/js_strings.php:103 msgid "Thu" msgstr "Чет" -#: ../../include/js_strings.php:97 +#: ../../include/js_strings.php:104 msgid "Fri" msgstr "Пят" -#: ../../include/js_strings.php:98 +#: ../../include/js_strings.php:105 msgid "Sat" msgstr "Суб" -#: ../../include/js_strings.php:99 +#: ../../include/js_strings.php:106 msgctxt "calendar" msgid "today" msgstr "сегодня" -#: ../../include/js_strings.php:100 +#: ../../include/js_strings.php:107 msgctxt "calendar" msgid "month" msgstr "месяц" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:108 msgctxt "calendar" msgid "week" msgstr "неделя" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "day" msgstr "день" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "All day" msgstr "Весь день" @@ -3376,27 +3391,27 @@ msgstr "Только публичные форумы" msgid "This Website Only" msgstr "Только этот веб-сайт" -#: ../../include/network.php:760 +#: ../../include/network.php:770 msgid "view full size" msgstr "посмотреть в полный размер" -#: ../../include/network.php:1763 ../../include/network.php:1764 +#: ../../include/network.php:1773 ../../include/network.php:1774 msgid "Friendica" msgstr "" -#: ../../include/network.php:1765 +#: ../../include/network.php:1775 msgid "OStatus" msgstr "" -#: ../../include/network.php:1766 +#: ../../include/network.php:1776 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1767 +#: ../../include/network.php:1777 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1768 ../../Zotlabs/Lib/Activity.php:1417 +#: ../../include/network.php:1778 ../../Zotlabs/Lib/Activity.php:1417 #: ../../Zotlabs/Lib/Activity.php:1614 #: ../../extend/addon/hzaddons/pubcrawl/as.php:1222 #: ../../extend/addon/hzaddons/pubcrawl/as.php:1377 @@ -3404,7 +3419,7 @@ msgstr "" msgid "ActivityPub" msgstr "" -#: ../../include/network.php:1769 ../../Zotlabs/Module/Cdav.php:1219 +#: ../../include/network.php:1779 ../../Zotlabs/Module/Cdav.php:1219 #: ../../Zotlabs/Module/Profiles.php:787 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 @@ -3416,27 +3431,27 @@ msgstr "" msgid "Email" msgstr "Электронная почта" -#: ../../include/network.php:1770 +#: ../../include/network.php:1780 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1771 +#: ../../include/network.php:1781 msgid "Facebook" msgstr "" -#: ../../include/network.php:1772 +#: ../../include/network.php:1782 msgid "Zot" msgstr "" -#: ../../include/network.php:1773 +#: ../../include/network.php:1783 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1774 +#: ../../include/network.php:1784 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1775 +#: ../../include/network.php:1785 msgid "MySpace" msgstr "" @@ -4080,7 +4095,7 @@ msgstr "Удалено администратором" #: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Group.php:144 #: ../../Zotlabs/Module/Wiki.php:218 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Lib/NativeWikiPage.php:561 #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172 msgid "Name" msgstr "Имя" @@ -4467,8 +4482,8 @@ msgstr "почта доставлен" msgid "Delivery report for %1$s" msgstr "Отчёт о доставке для %1$s" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 -#: ../../Zotlabs/Widget/Wiki_pages.php:96 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41 +#: ../../Zotlabs/Widget/Wiki_pages.php:98 msgid "Options" msgstr "Параметры" @@ -4593,16 +4608,16 @@ msgstr "Некоторые предложения о том, что делать msgid "Public access denied." msgstr "Публичный доступ запрещен." -#: ../../Zotlabs/Module/Display.php:375 ../../Zotlabs/Module/Channel.php:424 +#: ../../Zotlabs/Module/Display.php:374 ../../Zotlabs/Module/Channel.php:424 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:393 msgid "Article" msgstr "Статья" -#: ../../Zotlabs/Module/Display.php:446 +#: ../../Zotlabs/Module/Display.php:445 msgid "Item has been removed." msgstr "Элемент был удалён." @@ -5985,7 +6000,7 @@ msgstr "Создать событие" #: ../../Zotlabs/Module/Events.php:695 ../../Zotlabs/Module/Pubsites.php:60 #: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:410 #: ../../Zotlabs/Module/Layouts.php:198 msgid "View" msgstr "Просмотр" @@ -6161,7 +6176,7 @@ msgid "Use a photo from your albums" msgstr "Использовать фотографию из ваших альбомов" #: ../../Zotlabs/Module/Cover_photo.php:403 -#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:392 +#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:406 msgid "Choose a different album" msgstr "Выбрать другой альбом" @@ -8850,9 +8865,9 @@ msgstr "Домашняя страница, которая будет показ #: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " +"example: 'pubstream' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." -msgstr "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла." +msgstr "например: 'pubstream' для показа публичного потока, 'page/sys/home' для показа системной домашней веб-страницы или 'include:home.html' для включения файла." #: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Preserve site homepage URL" @@ -10458,101 +10473,101 @@ msgstr "Создать публикацию о статусе этой Wiki" msgid "Edit Wiki Name" msgstr "Редактировать наименование Wiki" -#: ../../Zotlabs/Module/Wiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:274 msgid "Wiki not found" msgstr "Wiki не найдена" -#: ../../Zotlabs/Module/Wiki.php:295 +#: ../../Zotlabs/Module/Wiki.php:300 msgid "Rename page" msgstr "Переименовать страницу" -#: ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Wiki.php:321 msgid "Error retrieving page content" msgstr "Ошибка при получении содержимого страницы" -#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326 +#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331 msgid "New page" msgstr "Новая страница" -#: ../../Zotlabs/Module/Wiki.php:354 +#: ../../Zotlabs/Module/Wiki.php:367 msgid "Revision Comparison" msgstr "Сравнение ревизий" -#: ../../Zotlabs/Module/Wiki.php:355 +#: ../../Zotlabs/Module/Wiki.php:368 #: ../../Zotlabs/Widget/Wiki_page_history.php:25 -#: ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Lib/NativeWikiPage.php:564 msgid "Revert" msgstr "Отменить" -#: ../../Zotlabs/Module/Wiki.php:362 +#: ../../Zotlabs/Module/Wiki.php:375 msgid "Short description of your changes (optional)" msgstr "Краткое описание ваших изменений (необязательно)" -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:385 msgid "Source" msgstr "Источник" -#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Wiki.php:395 msgid "New page name" msgstr "Новое имя страницы" -#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Wiki.php:400 msgid "Embed image from photo albums" msgstr "Встроить изображение из фотоальбома" -#: ../../Zotlabs/Module/Wiki.php:397 +#: ../../Zotlabs/Module/Wiki.php:411 msgid "History" msgstr "История" -#: ../../Zotlabs/Module/Wiki.php:473 +#: ../../Zotlabs/Module/Wiki.php:489 msgid "Error creating wiki. Invalid name." msgstr "Ошибка создания Wiki. Неверное имя." -#: ../../Zotlabs/Module/Wiki.php:480 +#: ../../Zotlabs/Module/Wiki.php:496 msgid "A wiki with this name already exists." msgstr "Wiki с таким именем уже существует." -#: ../../Zotlabs/Module/Wiki.php:493 +#: ../../Zotlabs/Module/Wiki.php:509 msgid "Wiki created, but error creating Home page." msgstr "Wiki создана, но возникла ошибка при создании домашней страницы" -#: ../../Zotlabs/Module/Wiki.php:500 +#: ../../Zotlabs/Module/Wiki.php:516 msgid "Error creating wiki" msgstr "Ошибка при создании Wiki" -#: ../../Zotlabs/Module/Wiki.php:523 +#: ../../Zotlabs/Module/Wiki.php:540 msgid "Error updating wiki. Invalid name." msgstr "Ошибка при обновлении Wiki. Неверное имя." -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:560 msgid "Error updating wiki" msgstr "Ошибка при обновлении Wiki" -#: ../../Zotlabs/Module/Wiki.php:558 +#: ../../Zotlabs/Module/Wiki.php:575 msgid "Wiki delete permission denied." msgstr "Нет прав на удаление Wiki." -#: ../../Zotlabs/Module/Wiki.php:568 +#: ../../Zotlabs/Module/Wiki.php:585 msgid "Error deleting wiki" msgstr "Ошибка удаления Wiki" -#: ../../Zotlabs/Module/Wiki.php:601 +#: ../../Zotlabs/Module/Wiki.php:618 msgid "New page created" msgstr "Создана новая страница" -#: ../../Zotlabs/Module/Wiki.php:722 +#: ../../Zotlabs/Module/Wiki.php:740 msgid "Cannot delete Home" msgstr "Невозможно удалить домашнюю страницу" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:804 msgid "Current Revision" msgstr "Текущая ревизия" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:804 msgid "Selected Revision" msgstr "Выбранная ревизия" -#: ../../Zotlabs/Module/Wiki.php:836 +#: ../../Zotlabs/Module/Wiki.php:854 msgid "You must be authenticated." msgstr "Вы должны быть аутентифицированы." @@ -11264,16 +11279,16 @@ msgstr "Исходящие" msgid "New Message" msgstr "Новое сообщение" -#: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 +#: ../../Zotlabs/Widget/Wiki_pages.php:34 +#: ../../Zotlabs/Widget/Wiki_pages.php:91 msgid "Add new page" msgstr "Добавить новую страницу" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 +#: ../../Zotlabs/Widget/Wiki_pages.php:85 msgid "Wiki Pages" msgstr "Wiki страницы" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Page name" msgstr "Название страницы" @@ -11464,24 +11479,24 @@ msgid "Delete conversation" msgstr "Удалить беседу" #: ../../Zotlabs/Widget/Wiki_page_history.php:23 -#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Lib/NativeWikiPage.php:562 msgctxt "wiki_history" msgid "Message" msgstr "Сообщение" #: ../../Zotlabs/Widget/Wiki_page_history.php:24 -#: ../../Zotlabs/Lib/NativeWikiPage.php:560 +#: ../../Zotlabs/Lib/NativeWikiPage.php:563 msgid "Date" msgstr "Дата" #: ../../Zotlabs/Widget/Wiki_page_history.php:26 -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 msgid "Compare" msgstr "Сравнить" #: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my channel stream and posts" -msgstr "Может просматривать мою ленту и сообщения" +msgstr "Может просматривать мой поток и сообщения" #: ../../Zotlabs/Access/Permissions.php:57 msgid "Can send me their channel stream and posts" @@ -11501,7 +11516,7 @@ msgstr "Может просматривать мое хранилище файл #: ../../Zotlabs/Access/Permissions.php:61 msgid "Can upload/modify my file storage and photos" -msgstr "Может загружать/изменять мои файлы и фотографии в хранилище" +msgstr "Может загружать/изменять мои файлы и фотографии в хранилище" #: ../../Zotlabs/Access/Permissions.php:62 msgid "Can view my channel webpages" @@ -11896,59 +11911,59 @@ msgid "edited a comment dated %s" msgstr "отредактировал комментарий датированный %s" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +#: ../../Zotlabs/Lib/NativeWikiPage.php:94 msgid "(No Title)" msgstr "(нет заголовка)" -#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +#: ../../Zotlabs/Lib/NativeWikiPage.php:109 msgid "Wiki page create failed." msgstr "Не удалось создать страницу Wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +#: ../../Zotlabs/Lib/NativeWikiPage.php:122 msgid "Wiki not found." msgstr "Wiki не найдена." -#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +#: ../../Zotlabs/Lib/NativeWikiPage.php:133 msgid "Destination name already exists" msgstr "Имя назначения уже существует" -#: ../../Zotlabs/Lib/NativeWikiPage.php:163 -#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +#: ../../Zotlabs/Lib/NativeWikiPage.php:362 msgid "Page not found" msgstr "Страница не найдена." -#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +#: ../../Zotlabs/Lib/NativeWikiPage.php:197 msgid "Error reading page content" msgstr "Ошибка чтения содержимого страницы" -#: ../../Zotlabs/Lib/NativeWikiPage.php:350 -#: ../../Zotlabs/Lib/NativeWikiPage.php:400 -#: ../../Zotlabs/Lib/NativeWikiPage.php:467 -#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +#: ../../Zotlabs/Lib/NativeWikiPage.php:353 +#: ../../Zotlabs/Lib/NativeWikiPage.php:402 +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +#: ../../Zotlabs/Lib/NativeWikiPage.php:510 msgid "Error reading wiki" msgstr "Ошибка чтения Wiki" -#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +#: ../../Zotlabs/Lib/NativeWikiPage.php:390 msgid "Page update failed." msgstr "Не удалось обновить страницу." -#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +#: ../../Zotlabs/Lib/NativeWikiPage.php:424 msgid "Nothing deleted" msgstr "Ничего не удалено" -#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +#: ../../Zotlabs/Lib/NativeWikiPage.php:490 msgid "Compare: object not found." msgstr "Сравнение: объект не найден." -#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +#: ../../Zotlabs/Lib/NativeWikiPage.php:496 msgid "Page updated" msgstr "Страница обновлена" -#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +#: ../../Zotlabs/Lib/NativeWikiPage.php:499 msgid "Untitled" msgstr "Не озаглавлено" -#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +#: ../../Zotlabs/Lib/NativeWikiPage.php:505 msgid "Wiki resource_id required for git commit" msgstr "Требуется resource_id Wiki для отправки в Git" @@ -12312,11 +12327,11 @@ msgstr "4. Эксперт - я умею программировать" msgid "5. Wizard - I probably know more than you do" msgstr "5. Волшебник - возможно я знаю больше чем ты" -#: ../../Zotlabs/Lib/NativeWiki.php:151 +#: ../../Zotlabs/Lib/NativeWiki.php:152 msgid "Wiki updated successfully" msgstr "Wiki успешно обновлена" -#: ../../Zotlabs/Lib/NativeWiki.php:205 +#: ../../Zotlabs/Lib/NativeWiki.php:206 msgid "Wiki files deleted successfully" msgstr "Wiki успешно удалена" @@ -12596,7 +12611,7 @@ msgstr "Ваш аккаунт на %s перестанет работать че #: ../../extend/addon/hzaddons/testdrive/testdrive.php:105 msgid "Your $Productname test account is about to expire." -msgstr "Ваша пробная учётная запись в $Productname близка к окончанию срока действия." +msgstr "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия." #: ../../extend/addon/hzaddons/redfiles/redfiles.php:119 msgid "Redmatrix File Storage Import" @@ -14465,11 +14480,11 @@ msgstr "" #: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:29 msgid "PHP post_max_size (must be larger than upload_max_filesize): " -msgstr "" +msgstr "PHP post_max_size (должен быть больше чем upload_max_filesize): " #: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:45 msgid "Flattr this!" -msgstr "" +msgstr "Flattr это!" #: ../../extend/addon/hzaddons/flattrwidget/flattrwidget.php:83 msgid "Flattr widget settings updated." diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 1010dbd3a..f536ea963 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -5,6 +5,7 @@ function string_plural_select_ru($n){ return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2)); }} App::$rtl = 0; +App::$strings["plural_function_code"] = "(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))"; App::$strings["Source channel not found."] = "Канал-источник не найден."; App::$strings["Default"] = "По умолчанию"; App::$strings["Focus (Hubzilla default)"] = "Фокус (по умолчанию Hubzilla)"; @@ -663,21 +664,41 @@ App::$strings["Thank you, this nickname is valid."] = "Спасибо, этот App::$strings["A channel name is required."] = "Требуется название канала."; App::$strings["This is a "] = "Это "; App::$strings[" channel name"] = " название канала"; +App::$strings["%d minutes"] = array( + 0 => "%d минуту", + 1 => "%d минуты", + 2 => "%d минут", +); +App::$strings["about %d hours"] = array( + 0 => "около %d часa", + 1 => "около %d часов", + 2 => "около %d часов", +); +App::$strings["%d days"] = array( + 0 => "%d день", + 1 => "%d дня", + 2 => "%d дней", +); +App::$strings["%d months"] = array( + 0 => "%d месяц", + 1 => "%d месяца", + 2 => "%d месяцев", +); +App::$strings["%d years"] = array( + 0 => "%d год", + 1 => "%d года", + 2 => "%d лет", +); App::$strings["timeago.prefixAgo"] = ""; -App::$strings["timeago.prefixFromNow"] = ""; +App::$strings["timeago.prefixFromNow"] = "через"; App::$strings["timeago.suffixAgo"] = "назад"; App::$strings["timeago.suffixFromNow"] = ""; App::$strings["less than a minute"] = "менее чем одну минуту"; App::$strings["about a minute"] = "около минуты"; -App::$strings["%d minutes"] = "%d минут"; App::$strings["about an hour"] = "около часа"; -App::$strings["about %d hours"] = "около %d часов"; App::$strings["a day"] = "день"; -App::$strings["%d days"] = "%d дней"; App::$strings["about a month"] = "около месяца"; -App::$strings["%d months"] = "%d месяцев"; App::$strings["about a year"] = "около года"; -App::$strings["%d years"] = "%d лет"; App::$strings[" "] = " "; App::$strings["timeago.numbers"] = ""; App::$strings["__ctx:long__ May"] = "Май"; @@ -1976,7 +1997,7 @@ App::$strings["This is displayed on the public server site list."] = "Это о App::$strings["Register text"] = "Текст регистрации"; App::$strings["Will be displayed prominently on the registration page."] = "Будет отображаться на странице регистрации на видном месте."; App::$strings["Site homepage to show visitors (default: login box)"] = "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)."; -App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла."; +App::$strings["example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "например: 'pubstream' для показа публичного потока, 'page/sys/home' для показа системной домашней веб-страницы или 'include:home.html' для включения файла."; App::$strings["Preserve site homepage URL"] = "Сохранить URL главной страницы сайта"; App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации"; App::$strings["Accounts abandoned after x days"] = "Аккаунты считаются заброшенными после N дней"; @@ -2596,12 +2617,12 @@ App::$strings["Delete conversation"] = "Удалить беседу"; App::$strings["__ctx:wiki_history__ Message"] = "Сообщение"; App::$strings["Date"] = "Дата"; App::$strings["Compare"] = "Сравнить"; -App::$strings["Can view my channel stream and posts"] = "Может просматривать мою ленту и сообщения"; +App::$strings["Can view my channel stream and posts"] = "Может просматривать мой поток и сообщения"; App::$strings["Can send me their channel stream and posts"] = "Может присылать мне свои потоки и сообщения"; App::$strings["Can view my default channel profile"] = "Может просматривать мой стандартный профиль канала"; App::$strings["Can view my connections"] = "Может просматривать мои контакты"; App::$strings["Can view my file storage and photos"] = "Может просматривать мое хранилище файлов"; -App::$strings["Can upload/modify my file storage and photos"] = "Может загружать/изменять мои файлы и фотографии в хранилище"; +App::$strings["Can upload/modify my file storage and photos"] = "Может загружать/изменять мои файлы и фотографии в хранилище"; App::$strings["Can view my channel webpages"] = "Может просматривать мои веб-страницы"; App::$strings["Can view my wiki pages"] = "Может просматривать мои вики-страницы"; App::$strings["Can create/edit my channel webpages"] = "Может редактировать мои веб-страницы"; @@ -2853,7 +2874,7 @@ App::$strings["Post to InsaneJournal by default"] = "Публиковать в I App::$strings["InsaneJournal Post Settings"] = "Настройки публикаций в InsaneJournal"; App::$strings["Insane Journal Settings saved."] = "Настройки InsaneJournal сохранены."; App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s перестанет работать через несколько дней."; -App::$strings["Your $Productname test account is about to expire."] = "Ваша пробная учётная запись в $Productname близка к окончанию срока действия."; +App::$strings["Your $Productname test account is about to expire."] = "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия."; App::$strings["Redmatrix File Storage Import"] = "Импорт файлового хранилища Redmatrix"; App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Это позволит импортировать все ваши файлы в Redmatrix в этот канал."; App::$strings["file"] = "файл"; @@ -3281,8 +3302,8 @@ App::$strings["Friendica Login Password"] = "Пароль для входа Fire App::$strings["Show Upload Limits"] = "Показать ограничения на загрузку"; App::$strings["Hubzilla configured maximum size: "] = "Максимальный размер настроенный в Hubzilla:"; App::$strings["PHP upload_max_filesize: "] = ""; -App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = ""; -App::$strings["Flattr this!"] = ""; +App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (должен быть больше чем upload_max_filesize): "; +App::$strings["Flattr this!"] = "Flattr это!"; App::$strings["Flattr widget settings updated."] = "Настройки виджета Flattr обновлены."; App::$strings["Flattr user"] = "Пользователь Flattr"; App::$strings["URL of the Thing to flattr"] = "URL ccылки на Flattr"; diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 01fc3f993..f7425ba98 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -34,7 +34,7 @@ 'name_ok1' : "{{$name_ok1}}", 'name_ok2' : "{{$name_ok2}}", - + 'plural_func' : "{{$plural_func}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", |