Merge remote-tracking branch 'english/master'
This commit is contained in:
Ozzie Isaacs
@@ -286,7 +286,7 @@ msgid "Add new user"
|
||||
msgstr "Добавить пользователя"
|
||||
|
||||
#: cps/admin.py:1268 cps/templates/admin.html:100
|
||||
msgid "Edit E-mail Server Settings"
|
||||
msgid "Edit Email Server Settings"
|
||||
msgstr "Изменить настройки SMTP"
|
||||
|
||||
#: cps/admin.py:1287
|
||||
@@ -299,7 +299,7 @@ msgstr ""
|
||||
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
|
||||
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
|
||||
#, python-format
|
||||
msgid "Database error: %(error)s."
|
||||
msgid "Oops! Database Error: %(error)s."
|
||||
msgstr ""
|
||||
|
||||
#: cps/admin.py:1316
|
||||
@@ -317,7 +317,7 @@ msgid "Please configure your e-mail address first..."
|
||||
msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
|
||||
|
||||
#: cps/admin.py:1323
|
||||
msgid "E-mail server settings updated"
|
||||
msgid "Email Server Settings updated"
|
||||
msgstr "Настройки E-mail сервера обновлены"
|
||||
|
||||
#: cps/admin.py:1346 cps/templates/admin.html:191
|
||||
@@ -338,7 +338,7 @@ msgstr ""
|
||||
|
||||
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
|
||||
#: cps/web.py:1320
|
||||
msgid "An unknown error occurred. Please try again later."
|
||||
msgid "Oops! An unknown error occurred. Please try again later."
|
||||
msgstr "Неизвестная ошибка. Попробуйте позже."
|
||||
|
||||
#: cps/admin.py:1386
|
||||
@@ -356,7 +356,7 @@ msgid "Password for user %(user)s reset"
|
||||
msgstr "Пароль для пользователя %(user)s сброшен"
|
||||
|
||||
#: cps/admin.py:1434 cps/web.py:1198
|
||||
msgid "Please configure the SMTP mail settings first..."
|
||||
msgid "Please configure the SMTP mail settings first."
|
||||
msgstr "Пожалуйста, сперва настройте параметры SMTP....."
|
||||
|
||||
#: cps/admin.py:1445
|
||||
@@ -474,7 +474,7 @@ msgid "Database Configuration"
|
||||
msgstr "Дополнительный Настройки"
|
||||
|
||||
#: cps/admin.py:1871 cps/web.py:1233
|
||||
msgid "Please fill out all fields!"
|
||||
msgid "Oops! Please complete all fields."
|
||||
msgstr "Пожалуйста, заполните все поля!"
|
||||
|
||||
#: cps/admin.py:1879
|
||||
@@ -488,7 +488,7 @@ msgstr "Пользователь '%(user)s' добавлен"
|
||||
|
||||
#: cps/admin.py:1902
|
||||
#, fuzzy
|
||||
msgid "Found an existing account for this e-mail address or name."
|
||||
msgid "Oops! An account already exists for this Email. or name."
|
||||
msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
|
||||
|
||||
#: cps/admin.py:1932
|
||||
@@ -505,7 +505,7 @@ msgid "No admin user remaining, can't delete user"
|
||||
msgstr "Это последний администратор, невозможно удалить пользователя"
|
||||
|
||||
#: cps/admin.py:1992 cps/web.py:1371
|
||||
msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
|
||||
msgid "Email can't be empty and has to be a valid Email"
|
||||
msgstr ""
|
||||
|
||||
#: cps/admin.py:2018
|
||||
@@ -535,7 +535,7 @@ msgstr "Нет"
|
||||
|
||||
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
|
||||
#: cps/web.py:1504 cps/web.py:1549
|
||||
msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
|
||||
msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
|
||||
msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
|
||||
|
||||
#: cps/editbooks.py:154 cps/editbooks.py:1221
|
||||
@@ -667,7 +667,7 @@ msgstr "%(format)s не найден: %(fn)s"
|
||||
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
|
||||
#: cps/templates/detail.html:46
|
||||
#, fuzzy
|
||||
msgid "Send to E-Reader"
|
||||
msgid "Send to eReader"
|
||||
msgstr "Отправить на Kindle"
|
||||
|
||||
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
|
||||
@@ -755,7 +755,7 @@ msgstr "Путь книги %(path)s не найден на Google Drive"
|
||||
|
||||
#: cps/helper.py:644 cps/web.py:1416
|
||||
#, fuzzy
|
||||
msgid "Found an existing account for this e-mail address"
|
||||
msgid "Oops! An account already exists for this Email."
|
||||
msgstr "Этот адрес электронной почты уже зарегистрирован."
|
||||
|
||||
#: cps/helper.py:652
|
||||
@@ -835,7 +835,7 @@ msgstr "Зарегистрируйтесь с %(provider)s"
|
||||
|
||||
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
|
||||
#, python-format
|
||||
msgid "you are now logged in as: '%(nickname)s'"
|
||||
msgid "Success! You are now logged in as: %(nickname)s"
|
||||
msgstr "вы вошли как пользователь '%(nickname)s'"
|
||||
|
||||
#: cps/oauth_bb.py:148
|
||||
@@ -1332,20 +1332,20 @@ msgstr "Список форматов файлов"
|
||||
|
||||
#: cps/web.py:1203
|
||||
#, python-format
|
||||
msgid "Book successfully queued for sending to %(kindlemail)s"
|
||||
msgid "Success! Book queued for sending to %(eReadermail)s"
|
||||
msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
|
||||
|
||||
#: cps/web.py:1207
|
||||
#, python-format
|
||||
msgid "Oops! There was an error sending this book: %(res)s"
|
||||
msgid "Oops! There was an error sending book: %(res)s"
|
||||
msgstr "При отправке этой книги произошла ошибка: %(res)s"
|
||||
|
||||
#: cps/web.py:1209
|
||||
msgid "Please update your profile with a valid Send to Kindle E-mail Address."
|
||||
msgid "Please update your profile with a valid Send to Kindle Email Address."
|
||||
msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
|
||||
|
||||
#: cps/web.py:1226
|
||||
msgid "E-Mail server is not configured, please contact your administrator!"
|
||||
msgid "Oops! Email server is not configured, please contact your administrator."
|
||||
msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
|
||||
|
||||
#: cps/templates/layout.html:68 cps/templates/layout.html:102
|
||||
@@ -1356,51 +1356,51 @@ msgid "Register"
|
||||
msgstr "Зарегистрироваться"
|
||||
|
||||
#: cps/web.py:1262
|
||||
msgid "Your e-mail is not allowed to register"
|
||||
msgid "Oops! Your Email is not allowed."
|
||||
msgstr "Ваш e-mail не подходит для регистрации"
|
||||
|
||||
#: cps/web.py:1266
|
||||
msgid "Confirmation e-mail was send to your e-mail account."
|
||||
msgid "Success! Confirmation Email has been sent."
|
||||
msgstr "Письмо с подтверждением отправлено вам на e-mail."
|
||||
|
||||
#: cps/web.py:1280
|
||||
msgid "Cannot activate LDAP authentication"
|
||||
msgid "Oops! Cannot activate LDAP authentication"
|
||||
msgstr "Не удается активировать LDAP аутентификацию"
|
||||
|
||||
#: cps/web.py:1299
|
||||
#, python-format
|
||||
msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
|
||||
msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
|
||||
msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
|
||||
|
||||
#: cps/web.py:1305
|
||||
#, python-format
|
||||
msgid "Could not login: %(message)s"
|
||||
msgid "Oops! Login Failed: %(message)s"
|
||||
msgstr "Не удалось войти: %(message)s"
|
||||
|
||||
#: cps/web.py:1309 cps/web.py:1334
|
||||
msgid "Wrong Username or Password"
|
||||
msgid "Oops! Invalid Username or Password."
|
||||
msgstr "Ошибка в имени пользователя или пароле"
|
||||
|
||||
#: cps/web.py:1316
|
||||
msgid "New Password was send to your email address"
|
||||
msgid "Success! New Password was sent to your Email."
|
||||
msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
|
||||
|
||||
#: cps/web.py:1322
|
||||
msgid "Please enter valid username to reset password"
|
||||
msgid "Oops! Please enter a valid username to reset password"
|
||||
msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
|
||||
|
||||
#: cps/web.py:1329
|
||||
#, python-format
|
||||
msgid "You are now logged in as: '%(nickname)s'"
|
||||
msgid "Success! You are now logged in as: %(nickname)s"
|
||||
msgstr "Вы вошли как: '%(nickname)s'"
|
||||
|
||||
#: cps/web.py:1396 cps/web.py:1445
|
||||
#, python-format
|
||||
msgid "%(name)s's profile"
|
||||
msgid "%(name)s's Profile"
|
||||
msgstr "Профиль %(name)s's"
|
||||
|
||||
#: cps/web.py:1412
|
||||
msgid "Profile updated"
|
||||
msgid Success! Profile updated"
|
||||
msgstr "Профиль обновлён"
|
||||
|
||||
#: cps/services/gmail.py:58
|
||||
@@ -1493,12 +1493,12 @@ msgstr "Имя пользователя"
|
||||
|
||||
#: cps/templates/admin.html:14 cps/templates/register.html:14
|
||||
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
|
||||
msgid "E-mail Address"
|
||||
msgid "Email"
|
||||
msgstr "Адрес электронной почты"
|
||||
|
||||
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
|
||||
#, fuzzy
|
||||
msgid "Send to E-Reader E-mail Address"
|
||||
msgid "Send to eReader Email"
|
||||
msgstr "Отправить на Kindle Адрес электронной почты"
|
||||
|
||||
#: cps/templates/admin.html:17 cps/templates/layout.html:91
|
||||
@@ -1546,7 +1546,7 @@ msgid "Import LDAP Users"
|
||||
msgstr "Импорт пользователей LDAP"
|
||||
|
||||
#: cps/templates/admin.html:62
|
||||
msgid "E-mail Server Settings"
|
||||
msgid "Email Server Settings"
|
||||
msgstr "Настройки SMTP-сервера"
|
||||
|
||||
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
|
||||
@@ -1567,11 +1567,11 @@ msgstr "SMTP-логин"
|
||||
|
||||
#: cps/templates/admin.html:83 cps/templates/admin.html:94
|
||||
#: cps/templates/email_edit.html:55
|
||||
msgid "From E-mail"
|
||||
msgid "From Email"
|
||||
msgstr "Отправитель"
|
||||
|
||||
#: cps/templates/admin.html:90
|
||||
msgid "E-Mail Service"
|
||||
msgid "EMail Service"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:91
|
||||
@@ -1644,15 +1644,15 @@ msgid "Scheduled Tasks"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
|
||||
msgid "Time at which tasks start to run"
|
||||
msgid "Start Time"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
|
||||
msgid "Maximum tasks duration"
|
||||
msgid "Maximum Duration"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:178
|
||||
msgid "Generate book cover thumbnails"
|
||||
msgid "Generate Thumbnails"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:182
|
||||
@@ -1660,11 +1660,11 @@ msgid "Generate series cover thumbnails"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
|
||||
msgid "Reconnect to Calibre Library"
|
||||
msgid "Reconnect Calibre Database"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:193
|
||||
msgid "Refresh Thumbnail Cover Cache"
|
||||
msgid "Refresh Thumbnail Cache"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/admin.html:199
|
||||
@@ -1704,7 +1704,7 @@ msgid "Details"
|
||||
msgstr "Подробности"
|
||||
|
||||
#: cps/templates/admin.html:227
|
||||
msgid "Current version"
|
||||
msgid "Current Version"
|
||||
msgstr "Текущая версия"
|
||||
|
||||
#: cps/templates/admin.html:234
|
||||
@@ -2181,7 +2181,7 @@ msgid "Enable Public Registration"
|
||||
msgstr "Разрешить публичную регистрацию"
|
||||
|
||||
#: cps/templates/config_edit.html:127
|
||||
msgid "Use E-Mail as Username"
|
||||
msgid "Use Email as Username"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/config_edit.html:132
|
||||
@@ -2536,7 +2536,7 @@ msgid "Edit Metadata"
|
||||
msgstr "Редактировать метаданные"
|
||||
|
||||
#: cps/templates/email_edit.html:13
|
||||
msgid "Choose Server Type"
|
||||
msgid "Email Account Type"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/email_edit.html:15
|
||||
@@ -3071,7 +3071,7 @@ msgid "Choose a username"
|
||||
msgstr "Выберите имя пользователя"
|
||||
|
||||
#: cps/templates/register.html:15
|
||||
msgid "Your email address"
|
||||
msgid "Your Email"
|
||||
msgstr "Ваш email-адрес"
|
||||
|
||||
#: cps/templates/remote_login.html:5
|
||||
@@ -3091,7 +3091,7 @@ msgid "This verification link will expire in 10 minutes."
|
||||
msgstr "Срок действия ссылки истекает через 10 минут."
|
||||
|
||||
#: cps/templates/schedule_edit.html:29
|
||||
msgid "Generate Book Cover Thumbnails"
|
||||
msgid "Generate Thumbnails"
|
||||
msgstr ""
|
||||
|
||||
#: cps/templates/schedule_edit.html:33
|
||||
@@ -3327,12 +3327,12 @@ msgstr "Выберите имя пользователя"
|
||||
|
||||
#: cps/templates/user_table.html:135
|
||||
#, fuzzy
|
||||
msgid "Enter E-mail Address"
|
||||
msgid "Enter Email Address"
|
||||
msgstr "Ваш email-адрес"
|
||||
|
||||
#: cps/templates/user_table.html:136
|
||||
#, fuzzy
|
||||
msgid "Enter E-Reader E-mail Address"
|
||||
msgid "Enter E-Reader Email Address"
|
||||
msgstr "Отправить на Kindle Адрес электронной почты"
|
||||
|
||||
#: cps/templates/user_table.html:136
|
||||
|
||||
Reference in New Issue
Block a user