From 961e615d9af3c8ed26252ec2181e2bc6288164ae Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 20 Oct 2017 10:24:15 -0700 Subject: [PATCH] i18n: Update translations. --- static/locale/bg/LC_MESSAGES/django.po | 420 +++++---- static/locale/bg/translations.json | 3 +- static/locale/cs/LC_MESSAGES/django.po | 427 +++++---- static/locale/cs/translations.json | 5 +- static/locale/de/LC_MESSAGES/django.po | 427 +++++---- static/locale/de/translations.json | 5 +- static/locale/es/LC_MESSAGES/django.po | 427 +++++---- static/locale/es/translations.json | 5 +- static/locale/fr/LC_MESSAGES/django.po | 540 +++++------ static/locale/fr/translations.json | 7 +- static/locale/hi/LC_MESSAGES/django.po | 415 +++++---- static/locale/hi/translations.json | 3 +- static/locale/hu/LC_MESSAGES/django.po | 415 +++++---- static/locale/hu/translations.json | 5 +- static/locale/it/LC_MESSAGES/django.po | 420 +++++---- static/locale/it/translations.json | 3 +- static/locale/ja/LC_MESSAGES/django.po | 421 +++++---- static/locale/ja/translations.json | 5 +- static/locale/ko/LC_MESSAGES/django.po | 420 +++++---- static/locale/ko/translations.json | 3 +- static/locale/ml/LC_MESSAGES/django.po | 415 +++++---- static/locale/ml/translations.json | 5 +- static/locale/nl/LC_MESSAGES/django.po | 417 +++++---- static/locale/nl/translations.json | 5 +- static/locale/pl/LC_MESSAGES/django.po | 419 +++++---- static/locale/pl/translations.json | 5 +- static/locale/pt/LC_MESSAGES/django.po | 415 +++++---- static/locale/pt/translations.json | 3 +- static/locale/ru/LC_MESSAGES/django.po | 417 +++++---- static/locale/ru/translations.json | 5 +- static/locale/sr/LC_MESSAGES/django.po | 415 +++++---- static/locale/sr/translations.json | 3 +- static/locale/zh_Hans/LC_MESSAGES/django.po | 938 ++++++++++---------- static/locale/zh_Hans/translations.json | 665 +++++++------- 34 files changed, 4604 insertions(+), 3899 deletions(-) diff --git a/static/locale/bg/LC_MESSAGES/django.po b/static/locale/bg/LC_MESSAGES/django.po index 5beff91eb8..7f1d21f711 100644 --- a/static/locale/bg/LC_MESSAGES/django.po +++ b/static/locale/bg/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-06 17:07+0000\n" +"POT-Creation-Date: 2017-10-20 17:27+0000\n" "PO-Revision-Date: 2017-09-04 03:34+0000\n" "Last-Translator: Greg Price \n" "Language-Team: Bulgarian (http://www.transifex.com/zulip/zulip/language/" @@ -194,7 +194,7 @@ msgstr "" #: templates/zerver/bankruptcy.html:5 templates/zerver/delete_message.html:3 #: templates/zerver/invite_user.html:5 templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "" @@ -396,11 +396,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Администратори" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Нормални потребители" @@ -466,17 +466,17 @@ msgid "Login" msgstr "Вход" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 #, fuzzy #| msgid "Terms of service" msgid "Terms of Service" msgstr "Условия за ползване" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "Правила за поверителност" @@ -488,7 +488,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "" @@ -504,11 +504,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "" @@ -750,7 +750,7 @@ msgstr "" msgid "Invite" msgstr "" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "" @@ -1042,19 +1042,19 @@ msgstr "Вход с Google" msgid "Sign in with GitHub" msgstr "" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first server's " -"administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured " +"privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1220,14 +1250,19 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:108 +#, python-format +msgid "Use %(external_host)s" +msgstr "" + +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms " @@ -1379,16 +1414,24 @@ msgid "" "

You can use any combination of these search operators in a single " "query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword." -"

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1488,16 +1531,16 @@ msgstr "" msgid "Save" msgstr "" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of " -"service.\n" -" Contact this server's " -"administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured " +"terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1559,60 +1602,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1632,167 +1670,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 zerver/views/users.py:84 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 zerver/views/users.py:84 #: zerver/views/users.py:100 zerver/views/users.py:170 #: zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:293 zerver/lib/message.py:304 -#: zerver/lib/message.py:309 zerver/lib/message.py:313 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1852,7 +1890,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1860,63 +1898,63 @@ msgstr "" msgid "Invalid type parameter" msgstr "" -#: zerver/lib/events.py:509 +#: zerver/lib/events.py:510 msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1925,12 +1963,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1999,7 +2041,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2071,56 +2113,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2129,15 +2171,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2178,43 +2224,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2262,49 +2308,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2348,11 +2394,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2405,11 +2451,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2525,12 +2571,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2619,10 +2665,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/bg/translations.json b/static/locale/bg/translations.json index 286b3fcda8..a5c96bfc63 100644 --- a/static/locale/bg/translations.json +++ b/static/locale/bg/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "(\u043d\u044f\u043c\u0430 \u0442\u0435\u043c\u0430)", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "", "Formatting": "", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", diff --git a/static/locale/cs/LC_MESSAGES/django.po b/static/locale/cs/LC_MESSAGES/django.po index dcf3acfaf9..83b2de2bf1 100644 --- a/static/locale/cs/LC_MESSAGES/django.po +++ b/static/locale/cs/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Czech (http://www.transifex.com/zulip/zulip/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,17 +19,17 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Neznámý název grafu: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "Čas začátku je později než čas konce. Začátek: %(start)s, konec: %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "Není dostupný žádný rozbor. Spojte se, prosím, se správcem serveru." @@ -193,7 +193,7 @@ msgstr "V případě nutnosti se podívejte do složky s nevyžádanou poštou." #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Zavřít" @@ -391,11 +391,11 @@ msgstr "Ano, smazat tuto zprávu" msgid "(Or visit the normal login page)" msgstr "(Nebo navštivte stránku pro běžné přihlášení)" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Správci" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Normální uživatelé" @@ -461,15 +461,15 @@ msgid "Login" msgstr "Přihlášení" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Zaregistrovat se" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "Podmínky užití služby" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "Postoj k soukromí" @@ -481,7 +481,7 @@ msgstr "Programy a začlenění" msgid "Desktop & mobile apps" msgstr "Programy pro stolní a přenosné počítače" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Začlenění" @@ -497,11 +497,11 @@ msgstr "Nejlepší rozhovor pro projekty s otevřeným zdrojovým kódem" msgid "The best chat for working groups and communities" msgstr "Nejlepší rozhovor pro pracovní skupiny a společenství" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "Přihlašte se nyní!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "Zaregistrujte se nyní!" @@ -741,7 +741,7 @@ msgstr "Zve se..." msgid "Invite" msgstr "Pozvat" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Klávesové zkratky" @@ -1033,19 +1033,19 @@ msgstr "Přihlásit se pomocí Google" msgid "Sign in with GitHub" msgstr "Přihlásit se pomocí GitHub" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Formátování zprávy" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Napíšete" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "Dostanete" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1053,7 +1053,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "Pro přidání zvýrazňování skladby do víceřádkového bloku kódu,\n po první sadě zpětných fajfek přidejte první krátký název v Pygmentu jazyka.\n Kódový blok rovněž můžete udělat odsazením každého řádku čtyřmi mezerami." -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1066,81 +1066,111 @@ msgstr "Také můžete udělat server's administrator\n" -" if you have any questions.\n" -" " -msgstr "\n Tato instalace Zulipu nemá nastaven postoj k soukromí.\n Pokud máte jakékoli otázky, spojte se s tímto správcem serveru.\n " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " +msgstr "" #: templates/zerver/realm_creation_failed.html:8 msgid "" @@ -1207,14 +1237,14 @@ msgid "Shorter is better than longer." msgstr "Kratší je lepší než delší." #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "Vedlejší doména" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "Adresa, kterou používáte k přihlášení se k vaší organizaci." -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1365,15 +1395,25 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " -msgstr "\n

Můžete v jednom dotazu přidat jakékoli spojení těchto vyhledávacích operátorů. Například:

\n\n

  skupina:název skupiny\n sender:uživatel@example.com\n klíčové slovo

\n\n

bude hledat zprávy odeslané uživatel@example.com skupině\n název skupiny\n obsahující klíčové slovo klíčové slovo.

\n " +msgstr "" #: templates/zerver/settings_overlay.html:16 msgid "Your account" @@ -1471,15 +1511,15 @@ msgstr "Smazat obrázek zastupující uživatele" msgid "Save" msgstr "Uložit" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " -msgstr "\n Tato instalace Zulipu nemá nastaveny podmínky používání.\n Pokud máte jakékoli otázky, spojte se s tímto správcem serveru.\n " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " +msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 msgid "Unknown email unsubscribe request" @@ -1535,60 +1575,55 @@ msgid "" " " msgstr "\n

Vaše organizace byla převedena z zulip.com na zulipchat.com! Nová služba, ten samý úžasný rozhovor. Musíte už udělat jen jednu věc.

\n

Přijmout podmínky užití Zulipu

\n " -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "Musí být oblastním správcem" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" -msgstr "Neplatný server Zulip: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" +msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "Neplatný klíč API" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "Tento klíč API pracuje jen na kořenové (root) poddoméně" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "Toto API není dostupné robotům měnícím chování internetových stránek (příchozí zpětná volání HTTP)." -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "Účet nečinný" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "Oblast pro účet byla vypnuta" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "Účet není spojen s touto poddoménou" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "Neplatný klíč API" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "Tento koncový bod nepřijímá požadavky robotů." -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "Tento koncový bod vyžaduje základní ověření HTTP." -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "Neplatná oprávňující hlavička pro základní ověření" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "Nepřihlášen" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "Roboti zabývající se měněním chování internetových stránek mohou přistupovat pouze k měnění chování internetových stránek" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "Přístup odepřen" @@ -1608,167 +1643,167 @@ msgstr "Poddoména může mít jen malá písmena, čísla a '-'." msgid "Subdomain unavailable. Please choose a different one." msgstr "Poddoména je nedostupná. Vyberte, prosím, jinou." -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "Organizace, ke které se pokoušíte pomocí {email} připojit, neexistuje." -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "Požádejte, prosím, o pozvání pro {email} od správce organizace." -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "Vaše adresa elektronické pošty, {email}, není ani v jedné z domén, jež jsou povoleny pro přihlášení účtu v této organizaci." -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "Použijte, prosím, vaši skutečnou adresu elektronické pošty." -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "Přidejte až 10 čárkou oddělených adres elektronické pošty." -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "Zadejte, prosím, ne více než 10 adres elektronické pošty." -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "Nelze zpracovat zprávu" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "Chybí parametr: 'komu' (příjemce)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "Neplatná hodnota 'op' (měla by být spustit nebo zastavit)" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "Vítejte v #**%s**." -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "Popis" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "Lodi ahóooj" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "Uživatel není oprávněn položit tuto otázku" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "'%s' už Zulip nepoužívá." -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "Nemůžete posílat soukromé zprávy mimo svoji organizaci." -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "Neplatný název skupiny '%s'" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "Název skupiny je příliš dlouhý (omezení: %s znaků)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "Název skupiny '%s' obsahuje znaky NULL (0x00)." -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "Zpráva nesmí být prázdná" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "Chybí předmět hovoru" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "Předmět hovoru nemůže být prázdný" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "Skupina '%(stream_name)s' neexistuje" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "Nejste oprávněn posílat skupině '%s'" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "Zpráva musí mít příjemce" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "Neplatný typ zprávy" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "Nemůžete dostat odběratele pro veřejné skupiny v této oblasti" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "Nelze získat odběratele pro skupinu pouze pro zvané" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "Nedostatečná oprávnění" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "Neplatná zpráva(y)" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "Neplatná adresa." -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "Mimo vaši doménu." -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "Již má účet." -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Nebyla potvrzena platnost některých adres elektronické pošty, takže nebyly odeslány žádné pozvánky." -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "Nebylo možné pozvat všechny." -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1829,7 +1864,7 @@ msgstr "Obličej '%s' neexistuje" msgid "Must be a realm administrator or emoji author" msgstr "Musí být oblastním správcem nebo tvůrcem obličeje" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "Neplatný znak v názvu obličeje" @@ -1841,59 +1876,59 @@ msgstr "Neplatný parametr typu" msgid "Could not allocate event queue" msgstr "Nepodařilo se přidělit zařazení událostí" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "Rámce pro začlenění" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "Plynulé začlenění" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "Zákaznická podpora" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "Nasazení" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "Spojení" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "Peníze" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "Samospráva" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "Odbyt" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "Různé" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "Nástroje pro sledování" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "Správa projektu" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "Výkonnost" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "Řízení verzí" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1902,12 +1937,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "Operátor %s nepodporován." -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" -msgstr "Od Push-oznamovacího-odražeče přijata chyba" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" +msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "Symbol neexistuje" @@ -1976,7 +2015,7 @@ msgstr "Název je příliš krátký!" msgid "Invalid characters in name!" msgstr "Neplatné znaky v názvu!" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "Špatný název nebo uživatelské jméno" @@ -2048,56 +2087,56 @@ msgstr "%s není povolený typ" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (%(value)s je chbná)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "Vnitřní serverová chyba" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "Chyba CSRF: {reason}" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "Míra používání API překročila omezení" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "Použít vzhled" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "Vzhled obličej 1" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "Vzhled Google" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "Vzhled Twitter" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "Obličej Unicode" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "Oblastní obličej" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "Další tváře Zulipu" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "Chybí argument 'queue_id'" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "Chybí argument 'last_event_id'" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "Nejste oprávněn dostávat události z této řady" @@ -2106,15 +2145,19 @@ msgstr "Nejste oprávněn dostávat události z této řady" msgid "Bad event queue id: {queue_id}" msgstr "Špatné ID zařazení události: {queue_id}" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "Neznámé nebo chybějící sezení" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "Symbol CSRF neodpovídá tomu, co je v koláčku" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "Nejte vlastníkem řady s ID '%s'" @@ -2155,43 +2198,43 @@ msgstr "Špatná poddoména" msgid "Invalid OTP" msgstr "Neplatný OTP" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "Vývojové prostředí nepovoleno." -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "Vaše oblast byla vypnuta." -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "Váš účet byl zakázán." -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "Tento uživatel není zaregistrován." -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "Ověření hesla je ve vaší skupině zakázáno." -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "Tento uživatel není zaregistrován; dělá z prohlížeče." -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "Vaše uživatelské jméno a heslo nejsou správné." -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "Neplatná poddoména" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "Požadována poddoména" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID není nastaven" @@ -2239,49 +2282,49 @@ msgstr "Skupina neexistuje: %s. Nebyly odeslány žádné pozvánky." msgid "Invalid narrow operator: {desc}" msgstr "Neplatný zužující operátor: {desc}" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "Žádný takový předmět hovoru '%s'" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "Neznámá oblast %s" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "Chybí odesílatel" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "Neplatná zrcadlená zpráva" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "Neplatná zrcadlená oblast" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "Názvy skupiny IRC musí začínaz #" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "Historie úprav zprávyje v této organizaci zakázána." -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "Vaše organizace vypnula upravování zpráv" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "Nemáte oprávnění k upravení této zprávy" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "Časová lhůta určená k upravení této zprávy uběhla" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "Nic k měnění" @@ -2326,11 +2369,11 @@ msgstr "Prázdný nebo neplatný symbol délky" msgid "Invalid APNS token" msgstr "Neplatný symbol APNS" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "Odpověď již existuje" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "Odpověď neexistuje" @@ -2383,11 +2426,11 @@ msgstr "Filtr nenalezen" msgid "You must upload exactly one icon." msgstr "Musíte nahrát přesně jednu ikonu." -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "Vytvoření nové organizace zakázáno." -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "Odkaz na vytvoření organizace vypršel nebo není platný." @@ -2432,10 +2475,6 @@ msgstr "Neznámé vlastnictví odběru: %s" msgid "Not subscribed to stream id %d" msgstr "Neodebírá ID skupiny %d" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "Do tutorial_send_message prošla špatná data" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "

Soubor nenalezen.

" @@ -2507,12 +2546,12 @@ msgstr "Nelze odstranit jediného správce organizace" msgid "Username already in use" msgstr "Uživatelské jméno se již používá" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "E-mail '%(email)s' nepovolen pro oblast '%(realm)s'" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "E-mail '%s' se již používá" @@ -2601,10 +2640,10 @@ msgstr "Nepodporovaný typ události \"nahorudolů\": %s" msgid "Unknown WordPress webhook action: " msgstr "Neznámá činnost zpětného volání HTTP WordPress:" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "Musí se osvědčit platnost pomocí platného klíče API serveru Zulip" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "Neplatný typ symbolu" diff --git a/static/locale/cs/translations.json b/static/locale/cs/translations.json index 9975201daf..df2bec5550 100644 --- a/static/locale/cs/translations.json +++ b/static/locale/cs/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "\"__file_name__\" byl příliš velký; největší velikost souboru je 25 MiB.", + "(This user has been deactivated)": "", "(no topic)": "(žádný předmět hovoru)", "24-hour time (17:00 instead of 5:00 PM)": "24hodinový čas (17:00 místo 5:00 odpoledne)", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "Soukromá: musí být pozván členem; noví členové mohou vidět pouze zprávy poslané až poté, co se připojili; skryto uživatelům, kteří nejsou správci", @@ -189,6 +190,7 @@ "Filter settings": "Nastavení filtrování", "Filter streams": "Filtrovat skupiny", "Filter users": "Filtrovat uživatele", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "Další údaje k veřejným/soukromým skupinám zjistíte v našich dokumentech.", "Forgotten it?": "Zapomněl jste?", "Formatting": "Formátování", @@ -292,7 +294,6 @@ "No users match your current filter.": "Vašemu nynějšímu filtru neodpovídají žádní uživatelé.", "None": "Žádný", "Note that any bots that you maintain will be disabled.": "Povšimněte si, že všichni vámi spravovaní roboti budou zakázáni.", - "Nothing selected.": "Nic není vybráno.", "Nothing to preview": "Nic k náhledu", "Notifications": "Oznámení", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "Oznámení jsou spuštěna, když přijde zpráva a okno Zulipu není zaměřeno nebo je zpráva mimo plátno obrazovky. ", @@ -509,4 +510,4 @@ "more topics": "více předmětů hovoru", "right": "vpravo", "text": "text" -} +} \ No newline at end of file diff --git a/static/locale/de/LC_MESSAGES/django.po b/static/locale/de/LC_MESSAGES/django.po index 1b62f6eb4f..f4bc02bf1f 100644 --- a/static/locale/de/LC_MESSAGES/django.po +++ b/static/locale/de/LC_MESSAGES/django.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-06 08:00+0000\n" -"Last-Translator: Robert Hönig \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: German (http://www.transifex.com/zulip/zulip/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,17 +28,17 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Unbekannter Tabellenname: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "Die Startzeit ist später als die Endzeit. Start: %(start)s, Ende: %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "Keine Analysedaten verfügbar. Bitte kontaktiere den Server-Administrator." @@ -202,7 +202,7 @@ msgstr "Schau um sicher zu gehen auch in deinem Spamordner nach." #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Schließen" @@ -400,11 +400,11 @@ msgstr "Ja, diese Nachricht löschen" msgid "(Or visit the normal login page)" msgstr "(Oder gehe zur normalen Login-Seite)" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Administratoren" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Normale Benutzer" @@ -470,15 +470,15 @@ msgid "Login" msgstr "Anmelden" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Registrieren" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "Nutzungsbedingungen" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "Datenschutzrichtlinie" @@ -490,7 +490,7 @@ msgstr "Apps & Integrationen" msgid "Desktop & mobile apps" msgstr "Desktop & mobile Apps" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Integrationen" @@ -506,11 +506,11 @@ msgstr "Der beste Chat für Open-Source Projekte" msgid "The best chat for working groups and communities" msgstr "Der beste Chat für Arbeitsgruppen und Communities" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "Jetzt anmelden!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "Jetzt registrieren!" @@ -750,7 +750,7 @@ msgstr "Lädt ein..." msgid "Invite" msgstr "Einladen" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Tastenkombinationen" @@ -1042,19 +1042,19 @@ msgstr "Anmelden mit Google Account" msgid "Sign in with GitHub" msgstr "Anmelden mit Github" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Nachrichtenformatierung" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Du tippst" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "Du bekommst" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1062,7 +1062,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "Um Code-Blöcke mit Syntax-Highlighting darzustellen, füge das erste Kürzel von Pygment für die Sprache nach den ersten Akzent-Zeichen (```) ein." -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1075,81 +1075,111 @@ msgstr "Du kannst auch auch server's administrator\n" -" if you have any questions.\n" -" " -msgstr "\nDiese Zulip-Installation hat keine Datenschutzrichtlinie konfiguriert.\nKontaktiere bitte den Server-Administrator,\nfalls Du Fragen hast." +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " +msgstr "" #: templates/zerver/realm_creation_failed.html:8 msgid "" @@ -1216,14 +1246,14 @@ msgid "Shorter is better than longer." msgstr "Kürzer ist besser als länger." #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "Subdomain" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "Die E-Mail-Adresse mit der du dich bei deiner Organisation anmeldest." -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1374,15 +1404,25 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " -msgstr "\n

Du kannst beliebige Kombinationen dieser Such-Operatoren in einer Abfrage kombinieren. Zum Beispiel

\n\n

  stream:Streamname\nsender:nutzer@beispiel.de\nkeyword

\n\n

sucht nach Nachrichten von nutzer@beispiel.de im Stream\nStreamname,\ndie das Stichwort keyword enthalten.

" +msgstr "" #: templates/zerver/settings_overlay.html:16 msgid "Your account" @@ -1480,15 +1520,15 @@ msgstr "Avatar entfernen" msgid "Save" msgstr "Speichern" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " -msgstr "\nDiese Zulip-Installation hat keine Nutzungsbedingungen konfiguriert.\nKontaktiere bitte den Server-Administrator,\nfalls Du Fragen hast." +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " +msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 msgid "Unknown email unsubscribe request" @@ -1544,60 +1584,55 @@ msgid "" " " msgstr "\n

Deine Organisation ist von zulip.com auf zulipchat.com umgezogen! Neuer Service, dieselbe tolle Konversation. Du musst nur noch eine letzte Sache erledigen.

\n

Nutzungsbedingungen von Zulip akzeptieren

" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "Muss ein Bereichsadministrator sein" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" -msgstr "Ungültiger Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" +msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "Ungültiger Api-Schlüssel" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "Dieser API-Schlüssel funktioniert nur auf der Root-Subdomäne" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "Diese API ist nicht zugänglich für \"Incoming Webhook\" Bots." -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "Konto ist nicht aktiv." -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "Bereich wurde für das Konto deaktiviert" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "Der Account gehört nicht zu dieser Subdomain" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "Ungültiger Api-Schlüssel" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "Dieser Endpunkt akzeptiert keine Bot-Anfragen." -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "Dieser Endpunkt benötigt HTTP Basic Authentication" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "Ungültiger Authorization Header für Basic Auth" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "Nicht eingeloggt" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "Webhook-Bots können nur auf Webhooks zugreifen" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "Zugang verweigert" @@ -1617,167 +1652,167 @@ msgstr "Die Subdomain darf nur Kleinbuchstaben, Zahlen und '-' enthalten." msgid "Subdomain unavailable. Please choose a different one." msgstr "DIe Subdomain ist nicht verfügbar. Bitte wähle eine andere." -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "Die Organisation, der Du mit der Email {email} beitreten willst, existiert nicht." -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "Bitte frage den Administrator der Organisation nach einer Einladung für {email}." -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "Deine Email {email} gehört zu keiner der für diese Organisation zum Registrieren erlaubten Domains." -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "Bitte benutze Deine echte Email." -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "Füge bis zu 10 kommaseparierte Email-Adressen hinzu." -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "Bitte gib höchstens 10 Emails ein." -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "Kann Nachricht nicht rendern" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "Fehlende Angabe: 'to' (Empfänger)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "Ungültiger 'op'-Wert (sollte entweder start oder stop sein)" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "Willkommen bei #**%s**." -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "Beschreibung" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "Hallo" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "Benutzer nicht authorisiert für diese Anfrage" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "%s benutzt den Chat nicht mehr" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "Du kannst keine Privaten Nachrichten " -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "Ungültiger Stream-Name '%s'" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "Stream-Name zu lang (Limit: %s Zeichen)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "Der Stream-Name '%s' enthält NULL- (0x00) Zeichen." -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "Nachricht kann nicht leer sein" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "Nachricht darf keine null-Bytes enthalten" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "Thema fehlt" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "Thema kann nicht leer sein" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "Der Stream '%(stream_name)s' existiert nicht" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "Nicht authorisiert um an Stream %s' zu senden" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "Nachricht muss mindestens einen Empfänger haben" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "Ungültiger Nachrichtentyp" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "Du kannst in diesem Bereich keine öffentlichen Streams abonnieren lassen" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "Kann Abonnenten für den geschlossenen Stream nicht laden" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "Ungenügende Berechtigungen" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "Ungültige Nachricht" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "Ungültige Adresse" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "Ausserhalb deiner Domain" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "Hat schon ein Konto." -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Einige Emails konnten nicht validiert werden, also wurden noch keine Einladungen gesendert." -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "Kann niemanden mehr einladen." -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1838,7 +1873,7 @@ msgstr "Das Emoji '%s' existiert nicht" msgid "Must be a realm administrator or emoji author" msgstr "Muss ein Bereichsadministrator oder Emoji-Autor sein." -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "Der Emoji-Name enthält ungültige Zeichen" @@ -1850,59 +1885,59 @@ msgstr "Ungültiger type-Parameter" msgid "Could not allocate event queue" msgstr "Kann Ereignisskette nicht alloziieren" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "Integrations-Frameworks" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "Kontinuierliche Integration" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "Kundenbetreuung" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "Softwarebereitstellung" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "Kommunikation" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "Finanzen" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "Personalwesen" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "Marketing" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "Verschiedenes" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "Überwachungssysteme" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "Projektmanagement" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "Produktivität" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "Versionsverwaltung" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "Interaktive Bots" @@ -1911,12 +1946,16 @@ msgstr "Interaktive Bots" msgid "Operator %s not supported." msgstr "Operator %s nicht unterstützt." -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" -msgstr "Fehler empfangen vom Push-Benachrichtigungs-Bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" +msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "Token existiert nicht" @@ -1985,7 +2024,7 @@ msgstr "Name zu kurz!" msgid "Invalid characters in name!" msgstr "Ungültige Zeichen im Namen!" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "schlechter Name oder Benutzername" @@ -2057,56 +2096,56 @@ msgstr "%s ist kein allowed_type" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (%(value)s ist falsch)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "Interner Serverfehler" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "CSRF Fehler: {reason}" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "API-Nutzungsrate überschritten" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "Apple Style" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "Emoji One Style" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "Google Style" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "Twitter Style" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "Unicode Emoji" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "Emoji für gesamten Bereich" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "Y" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "Argument 'query_id' fehlt" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "Argument 'last_event_id' fehlt" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "Du bist nicht dazu authorisiert, Events von dieser Queue abzufragen" @@ -2115,15 +2154,19 @@ msgstr "Du bist nicht dazu authorisiert, Events von dieser Queue abzufragen" msgid "Bad event queue id: {queue_id}" msgstr "Ungültige Event-Queue-ID: {queue_id}" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "Unbekannte oder fehlende Session" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "CSRF Token stimmt nicht mit dem Cookie überein" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "Du bist nicht der Eigentümer der Queue mit der ID '%s'" @@ -2164,43 +2207,43 @@ msgstr "Ungültiger Subdomain" msgid "Invalid OTP" msgstr "Ungültiges OTP" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "Enwicklungsumgebung nicht aktiviert." -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "Dein Bereich wurde deaktviert." -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "Dein Konto wurde deaktiviert" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "Dieser Nutzer ist nicht registriert." -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "Passwort-Authentifizierung ist für Dein Team deaktiviert." -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "Dieser Nutzer ist nicht registriert; registriere ihn über einen Browser." -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "Entweder ist dein Benutzername oder dein Passwort falsch" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "Ungültige Subdomain" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "Subdomain benötigt" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID wurde nicht konfiguriert" @@ -2248,49 +2291,49 @@ msgstr "Stream existiert nicht: %s. Es wurden keine Einladungen versendet." msgid "Invalid narrow operator: {desc}" msgstr "Ungültiger Begrenzungs-Operator: {desc}" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "Kein Thema %s' vorhanden" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "Unbekannter Bereich: %s" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "Fehlender Absender" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "Ungültige gespiegelte Nachricht" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "Ungültiger gespiegelter Bereich" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "IRC Streamnamen müssen mit einem # beginnen" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "Die Anzeige des Nachrichten-Editierverlaufs ist in dieser Organisation deaktivert" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "Das Editieren von Nachrichten ist in Deiner Organisation deaktiviert" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "Du hast keine Berechtigung diese Nachricht zu editieren" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "Die Zeit zum bearbeiten der Nachricht ist abgelaufen" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "Nichts zu ändern" @@ -2335,11 +2378,11 @@ msgstr "Token leer oder Länge ungültig" msgid "Invalid APNS token" msgstr "Ungültiges APNS Token" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "Reaktion existiert bereits" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "Reaktion existiert noch nicht" @@ -2392,11 +2435,11 @@ msgstr "Filter nicht gefunden" msgid "You must upload exactly one icon." msgstr "Du musst genau ein Icon hochladen" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "Das Erstellen einer neuen Organisation ist deaktiviert." -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "Der Link zur Erstellung von Organisationen ist abgelaufen oder nicht länger gültig." @@ -2441,10 +2484,6 @@ msgstr "Unbekannte Abonnementeigenschaft: %s" msgid "Not subscribed to stream id %d" msgstr "Stream mit ID %d ist nicht abonniert" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "Ungültige Daten wurden an tutorial_send_message übergeben" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "

Datei nicht gefunden.

" @@ -2516,12 +2555,12 @@ msgstr "Der einzige Administrator der Organisation ist nicht entfernbar" msgid "Username already in use" msgstr "Benutzername wird schon verwendet" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "Die Email '%(email)s' ist nicht erlaubt für den Bereich '%(realm)s'" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "Email-Adresse %s' wird schon verwendet" @@ -2610,10 +2649,10 @@ msgstr "Ungültiger Updown Event-Typ: %s" msgid "Unknown WordPress webhook action: " msgstr "Unbekannte WordPress Webhook-Aktion:" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "Muss mit gültigem Zulip-Server-API-Schlüssel validiert werden." -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "Ungültiger Token-Typ" diff --git a/static/locale/de/translations.json b/static/locale/de/translations.json index a0c7cfeaa0..ffcafce36b 100644 --- a/static/locale/de/translations.json +++ b/static/locale/de/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "\"__file_name__\" ist zu groß, die maximal erlaubte Dateigröße ist 25MiB.", + "(This user has been deactivated)": "", "(no topic)": "(kein Thema)", "24-hour time (17:00 instead of 5:00 PM)": "24-Stunden Anzeige (17:00 anstatt 5:00 PM)", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "Privat: Nutzer müssen von einem Mitglied eingeladen werden; Neue Nutzer sehen nur Nachrichten, die nach ihrem Beitritt gesendet wurden; nur für Administratoren sichtbar", @@ -189,6 +190,7 @@ "Filter settings": "Filter-Einstellungen", "Filter streams": "Streams filtern", "Filter users": "Benutzer filtern", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "Für weitere Informationen zu öffentlichen/privaten Streams, schau dir unsere Dokumentation an.", "Forgotten it?": "Passwort vergessen?", "Formatting": "Formatierung", @@ -292,7 +294,6 @@ "No users match your current filter.": "Dein aktueller Filter stimmt mit keinem Nutzer überein.", "None": "Nichts", "Note that any bots that you maintain will be disabled.": "Beachte, dass alle Deine Bots deaktiviert werden.", - "Nothing selected.": "Nichts ausgewählt.", "Nothing to preview": "Keine Vorschau vorhanden", "Notifications": "Benachrichtigungen", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "Benachrichtigungen werden ausgelöst wenn eine Nachricht ankommt und Zulip nicht im Fokus, oder die Nachricht off-screen ist.", @@ -509,4 +510,4 @@ "more topics": "mehr Themen", "right": "rechts", "text": "Text" -} +} \ No newline at end of file diff --git a/static/locale/es/LC_MESSAGES/django.po b/static/locale/es/LC_MESSAGES/django.po index 1cf1a67fee..83326310d9 100644 --- a/static/locale/es/LC_MESSAGES/django.po +++ b/static/locale/es/LC_MESSAGES/django.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Spanish (http://www.transifex.com/zulip/zulip/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,17 +22,17 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Nombre de gráfica desconocido: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "La fecha de inicio es posterior a la del final. Inicio: %(start)s, Final: %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "No hay datos de analíticas disponible. Por favor, contacta con el administrador de tu servidor." @@ -196,7 +196,7 @@ msgstr "Por si acaso, échale un vistazo a tu carpeta de Spam." #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Cerrar" @@ -394,11 +394,11 @@ msgstr "Sí, elimina este mensaje" msgid "(Or visit the normal login page)" msgstr "(O visita la página de inicio de sesión normal)" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Administradores" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Usuarios normales" @@ -464,15 +464,15 @@ msgid "Login" msgstr "Iniciar sesión" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Registrar" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "los Términos de Servicio" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "Política de privacidad" @@ -484,7 +484,7 @@ msgstr "Apps e integraciones" msgid "Desktop & mobile apps" msgstr "Apps móviles y de escritorio" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Integraciones" @@ -500,11 +500,11 @@ msgstr "El mejor chat para proyectos de código abierto" msgid "The best chat for working groups and communities" msgstr "El mejor chat para comunidades y grupos de trabajo" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "¡Inicia sesión ya!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "¡Regístrate ya!" @@ -744,7 +744,7 @@ msgstr "Invitando..." msgid "Invite" msgstr "Invitar" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Atajos de teclado" @@ -1036,19 +1036,19 @@ msgstr "Iniciar sesión con Google" msgid "Sign in with GitHub" msgstr "Iniciar sesión con GitHub" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Formato de mensajes" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Tu digitas" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "Tu obtienes" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1056,7 +1056,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "Para añadir resaltado de sintaxis a un bloque de código de varias líneas, añade el primer apodo de Pygments tras el primer grupo de tildes.\nTambién puedes hacer un bloque de código sangrando cada línea con 4 espacios." -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1069,81 +1069,111 @@ msgstr "También puedes hacer server's administrator\n" -" if you have any questions.\n" -" " -msgstr "\nEsta instalación de Zulip no tiene configurada una política de privacidad. Contacta con el administrador de este servidor si tienes alguna pregunta." +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " +msgstr "" #: templates/zerver/realm_creation_failed.html:8 msgid "" @@ -1210,14 +1240,14 @@ msgid "Shorter is better than longer." msgstr "Más corto es mejor que más largo." #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "Subdominio" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "La dirección que usarás para registrarte en tu organización." -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1368,15 +1398,25 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " -msgstr "\n

Puedes usar cualquier combinación de estos operadores de en una misma búsqueda. Por ejemplo:

\n\n

  stream:nombre_del_canal\nsender:usuario@ejemplo.com\npalabra_clave

\n\n

buscaría mensajes enviados por usuario@ejemplo.com al canal\nnombre_del_canal\nque contuviesen palabra_clave.

" +msgstr "" #: templates/zerver/settings_overlay.html:16 msgid "Your account" @@ -1474,15 +1514,15 @@ msgstr "Eliminar avatar" msgid "Save" msgstr "Guardar" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " -msgstr "\nEsta instalación de Zulip no tiene configurados unos términos de servicio. Contacta con el administrador de este servidor si tienes alguna pregunta." +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " +msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 msgid "Unknown email unsubscribe request" @@ -1538,60 +1578,55 @@ msgid "" " " msgstr "\n

¡Tu organización ha sido migrada de zulip.com a zulipchat.com! Nuevo servicio, la conversación genial de siempre. Solo necesitamos que hagas una última cosa.

\n

Acepta los términos de servicio de Zulip

\n " -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "Necesitas ser un administrador de la instancia" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" -msgstr "Servidor Zulip inválido: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" +msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "Clave de API inválida" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "Esta clave de API solo funciona en el subdominio raíz" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "Esta API no está disponible a los bots de webhook de entrada." -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "Cuenta no activa" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "La instancia para la cuenta ha sido desactivada" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "Cuenta no asociada con este subdominio" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "Clave de API inválida" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "Este endpoint no acepta peticiones de bots." -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "Este endpoint requiere autentificación HTTP básica." -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "Cabecera de autorización inválida para la autentificación básica" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "No has iniciado sesión" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "Los bots de webhook solo pueden acceder a los webhooks" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "Acceso denegado" @@ -1611,167 +1646,167 @@ msgstr "El subdominio solo puede tener letras minúsculas, números, y '-'." msgid "Subdomain unavailable. Please choose a different one." msgstr "Subdominio no disponible. Por favor, escoge uno distinto." -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "La organización a la que estás intentando unirte usando {email} no existe." -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "Por favor, solicita una invitación para {email} del administrador de la organización." -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "Tu dirección de correo electrónico, {email}, no está en uno de los dominios permitidos para el registro de cuentas en esta organización." -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "Por favor, usa tu dirección de correo electrónico real." -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "Añade hasta 10 direcciones de correo electrónico separadas por comas." -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "Por favor, introduce como máximo 10 correos." -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "No se pudo renderizar el mensaje" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "Falta parámetro: 'to' (destinatario)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "Valor 'op' inválido (debería ser start o stop)" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "Te damos la bienvenida a #**%s**." -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "Descripción" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "hola" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "Usuario no autorizado para esta petición" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "'%s' ya no usa Zulip." -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "No puedes enviar mensajes privados fuera de tu organización." -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "Nombre de canal '%s' inválido" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "Nombre de canal demasiado largo (límite: %s caracteres)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "El nombre de canal '%s' contiene caracteres NULL (0x00)." -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "El mensaje no puede estar vacío" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "Falta el tema" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "El tema no puede estar vacío" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "El canal '%(stream_name)s' no existe" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "No autorizado a enviar al canal '%s'" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "El mensaje debe tener destinatarios" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "Tipo de mensaje inválido" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "No puedes poner suscriptores de canales públicos en esta instancia" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "No se pudo recopilar los suscriptores para un canal limitado por invitación" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "Permisos insuficientes" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "Mensaje(s) inválido(s)" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "Dirección inválida." -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "Fuera de tu dominio." -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "Ya tiene una cuenta." -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Algunos correos electrónicos no se han validado, por lo que no hemos enviado ninguna invitación." -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "No hemos podido invitar a nadie." -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1832,7 +1867,7 @@ msgstr "El emoticono '%s' no existe" msgid "Must be a realm administrator or emoji author" msgstr "Debes ser administrador de la instancia o autor del emoticono" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "Caracteres inválidos en el nombre del emoticono" @@ -1844,59 +1879,59 @@ msgstr "Tipo de parámetro inválido" msgid "Could not allocate event queue" msgstr "No se pudo ubicar la cola de eventos" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "Frameworks de integraciones" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "Integración continua" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "Atención al cliente" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "Despliegue" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "Comunicación" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "Finanzas" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "Recursos humanos" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "Marketing" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "Miscelánea" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "Herramientas de monitorización" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "Gestión de proyectos" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "Productividad" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "Control de versiones" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1905,12 +1940,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "Operador %s no soportado." -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" -msgstr "Error recibido del bouncer de notificaciones push" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" +msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "El token no existe" @@ -1979,7 +2018,7 @@ msgstr "¡Nombre demasiado corto!" msgid "Invalid characters in name!" msgstr "¡Caracteres inválidos en el nombre!" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "Nombre o nombre de usuario erróneo" @@ -2051,56 +2090,56 @@ msgstr "%s no es un allowed_type" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (%(value)s está mal)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "Error interno del servidor" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "Error CSRF: {reason}" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "El uso de la API excedió el límite" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "Estilo Apple" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "Estilo Emoji One" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "Estilo Google" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "Estilo Twitter" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "Emoticonos unicode" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "Emoticonos de la instancia" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "Emoticonos extra de Zulip" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "Falta el argumento 'queue_id'" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "Falta el argumento 'last_event_id'" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "No estás autorizado a tomar eventos de esta cola" @@ -2109,15 +2148,19 @@ msgstr "No estás autorizado a tomar eventos de esta cola" msgid "Bad event queue id: {queue_id}" msgstr "Identificador de la cola de eventos erróneo: {queue_id}" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "Sesión desconocida o ausente" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "El token CSRF no se corresponde con el de la cookie" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "No eres el propietario de la cola con identificador '%s'" @@ -2158,43 +2201,43 @@ msgstr "Subdominio erróneo" msgid "Invalid OTP" msgstr "OTP inválida" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "Entorno de desarrollo no activado." -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "Tu instancia ha sido desactivada." -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "Tu cuenta ha sido desactivada." -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "Este usuario no está registrado." -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "La autentificación por contraseña está desactivada en tu equipo." -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "Este usuario no está registrado; hazlo desde un navegador." -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "Tu nombre de usuario o contraseña es incorrecto." -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "Subdominio inválido" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "Subdominio requerido" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID no está configurado" @@ -2242,49 +2285,49 @@ msgstr "El canal no existe: %s. No se enviaron invitaciones." msgid "Invalid narrow operator: {desc}" msgstr "Operador de filtro inválido: {desc}" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "No existe el tema '%s'" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "Instancia '%s' desconocida" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "Falta el remitente" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "Mensaje reflejado inválido" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "Instancia reflejada inválida" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "Los nombres de canal IRC deben empezar con #" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "El historial de edición de mensajes está desactivado en esta organización" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "Tu organización ha desactivado la edición de mensajes" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "No tienes permiso para editar este mensaje" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "El límite de tiempo para editar este mensaje ha pasado" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "Nada que cambiar" @@ -2329,11 +2372,11 @@ msgstr "Token vacío o de longitud inválida" msgid "Invalid APNS token" msgstr "Token APNS inválido" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "Ya existe la reacción" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "La reacción no existe" @@ -2386,11 +2429,11 @@ msgstr "Filtro no encontrado" msgid "You must upload exactly one icon." msgstr "Debes subir exactamente un icono." -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "Creación de nuevas organizaciones desactivada." -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "El enlace de creación de organización ha expirado o no es válido." @@ -2435,10 +2478,6 @@ msgstr "Propiedad de suscripción desconocida: %s" msgid "Not subscribed to stream id %d" msgstr "No suscrito al id de canal %d" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "Datos erróneos pasados a tutorial_send_message" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "

Archivo no encontrado.

" @@ -2510,12 +2549,12 @@ msgstr "No se puede quitar el único administrador de la organización" msgid "Username already in use" msgstr "Ese nombre de usuario ya se está usando" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "El correo '%(email)s' no está permitido en la instancia '%(realm)s'" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "Esa dirección de correo '%s' ya se está usando" @@ -2604,10 +2643,10 @@ msgstr "Tipo de evento Updown no soportado: %s" msgid "Unknown WordPress webhook action: " msgstr "Acción del webhook WordPress desconocida:" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "Debe validarse con una clave de API válida del servidor de Zulip" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "Tipo de token inválido" diff --git a/static/locale/es/translations.json b/static/locale/es/translations.json index 9905199e7d..ed764f8681 100644 --- a/static/locale/es/translations.json +++ b/static/locale/es/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "\"__file_name__\" era demasiado grande; el tamaño máximo para el archivo es de 25MiB.", + "(This user has been deactivated)": "", "(no topic)": "(sin tema)", "24-hour time (17:00 instead of 5:00 PM)": "Formato horario de 24 horas (17:00 en vez de 5:00 PM)", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "Privado: hace falta ser invitado por un miembro; los nuevos miembros solo pueden ver los mensajes enviados después de haberse unido; oculto de usuarios que no son administradores", @@ -189,6 +190,7 @@ "Filter settings": "Filtrar ajustes", "Filter streams": "Filtrar canales", "Filter users": "Filtrar usuarios", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "Para más información sobre canales públicos/privados, echa un vistazo a nuestra documentación.", "Forgotten it?": "¿Te has olvidado?", "Formatting": "Formato", @@ -292,7 +294,6 @@ "No users match your current filter.": "No hay usuarios que coincidan con tu filtro actual.", "None": "Ninguno", "Note that any bots that you maintain will be disabled.": "Ten en cuenta que cualquier bot que mantengas será desactivado.", - "Nothing selected.": "Nada seleccionado.", "Nothing to preview": "Nada que previsualizar", "Notifications": "Notificaciones", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "Las notificaciones saltan cuando un mensaje llega y Zulip no está en primer plano o el mensaje está fuera de la pantalla", @@ -509,4 +510,4 @@ "more topics": "más temas", "right": "derecha", "text": "texto" -} +} \ No newline at end of file diff --git a/static/locale/fr/LC_MESSAGES/django.po b/static/locale/fr/LC_MESSAGES/django.po index 33a49838ee..291897d50d 100644 --- a/static/locale/fr/LC_MESSAGES/django.po +++ b/static/locale/fr/LC_MESSAGES/django.po @@ -3,8 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Kaiiju , 2017 # Fabrice Lamachère , 2017 # Manuel Tondeur , 2017 +# Mathieu GRIMARD , 2017 +# Paul LUBAWY , 2017 # psyray , 2017 # Reid Barton , 2015 # Sulian Lanteri , 2017 @@ -13,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 19:25+0000\n" -"Last-Translator: Manuel Tondeur \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: French (http://www.transifex.com/zulip/zulip/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,17 +26,17 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Nom de graphique inconnu : %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "L'heure de début est postérieure à l'heure de fin. Début : %(start)s, Fin : %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "Aucune donnée d'analyse disponible. Veuillez contacter votre administrateur système." @@ -44,7 +47,7 @@ msgstr "" #: templates/analytics/stats.html:21 msgid "Messages sent over time" -msgstr "" +msgstr "Messages envoyés au fil du temps" #: templates/analytics/stats.html:23 msgid "Aggregation" @@ -119,7 +122,7 @@ msgstr "Dernière mise à jour" msgid "" "A full update of all the graphs happens once a day.
The “Messages Sent " "Over Time” graph is updated once an hour." -msgstr "" +msgstr "Une mise à jour complète de tous les graphiques a lieu une fois par jour.
Le graphique des \"Messages envoyés au cours du temps\" est mis à jour une fois par heure." #: templates/analytics/stats.html:93 msgid "Analytics documentation" @@ -197,7 +200,7 @@ msgstr "Au cas où, jetez un coup d’œil à votre dossier Indésirables" #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Fermer" @@ -215,7 +218,7 @@ msgstr "Non, je verrai par moi-même." #: templates/zerver/closed_realm.html:4 msgid "Closed realm" -msgstr "" +msgstr "environnement fermé " #: templates/zerver/closed_realm.html:6 templates/zerver/invalid_realm.html:11 msgid "Hi there! Thank you for your interest in Zulip." @@ -227,7 +230,7 @@ msgid "" "The organization you are trying to join, %(closed_domain_name)s, only allows" " users with e-mail addresses within the organization. Please ask for a new " "invite to an appropriate e-mail address." -msgstr "" +msgstr "L’organisation que vous essayez de rejoindre : %(closed_domain_name)s est seulement accessible par les utilisateurs possédant une adresse e-mail autorisé. S'il vous plait demandez la vérification de votre adresse e-mail." #: templates/zerver/compose.html:8 templates/zerver/compose.html:10 #: templates/zerver/compose.html:98 @@ -316,7 +319,7 @@ msgid "" " organization first. Please use EmailAuthBackend to create\n" " your organization and then try again.\n" " " -msgstr "" +msgstr "\n Vous êtes en train de vous connecter en utilisant LDAP sans avoir créer une\n organisation. Merci d'utiliser EmailAuthBackend afin de créer\n votre organisation et ensuite de réessayer.\n " #: templates/zerver/confirm_continue_registration.html:10 msgid "Zulip account not found." @@ -327,7 +330,7 @@ msgid "" "\n" " Please click the following button if you wish to register.\n" " " -msgstr "" +msgstr "\n Merci de cliquer sur le bouton suivant si vous voulez vous inscrire\n " #: templates/zerver/confirm_continue_registration.html:24 #, python-format @@ -337,7 +340,7 @@ msgid "" " No account found for %(email)s. Would you like to register instead?\n" "\n" " " -msgstr "" +msgstr "\n\n Nous n'avons pas trouvé de compte pour : %(email)s. voulez vous vous enregistrer maintenant ?" #: templates/zerver/confirm_continue_registration.html:38 msgid "Go back to login" @@ -345,7 +348,7 @@ msgstr "Retourner à la page de connexion" #: templates/zerver/confirm_continue_registration.html:52 msgid "Register instead" -msgstr "" +msgstr "Inscrivez vous maintenant" #: templates/zerver/create_realm.html:18 msgid "Create a new Zulip organization" @@ -371,7 +374,7 @@ msgid "" " Please contact %(support_email)s to reactivate\n" " this group.\n" " " -msgstr "" +msgstr "\n l’organisation que vous essayez de rejoindre : %(deactivated_domain_name)s, a été désactivé.\n S'il vous plait contactez : %(support_email)s pour la réactiver.\n Ce groupe." #: templates/zerver/delete_message.html:4 msgid "Delete message" @@ -393,13 +396,13 @@ msgstr "Oui, supprimer ce message" #: templates/zerver/dev_login.html:12 msgid "(Or visit the normal login page)" -msgstr "" +msgstr "(Ou visitez la page de connexion normale)" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Administrateurs" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Utilisateurs normaux" @@ -465,15 +468,15 @@ msgid "Login" msgstr "Se connecter" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "S'inscrire" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "Conditions d'utilisation" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "Politique de confidentialité" @@ -485,7 +488,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Intégrations" @@ -499,13 +502,13 @@ msgstr "Le meilleur chat pour les projets open-source" #: templates/zerver/for-working-groups-and-communities.html:23 msgid "The best chat for working groups and communities" -msgstr "" +msgstr "Le meilleur chat pour travailler en groupes et en communautés" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "Connectez vous maintenant !" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "Enregistrez vous maintenant !" @@ -564,7 +567,7 @@ msgid "" "

Why not \n" " start the conversation?

\n" " " -msgstr "" +msgstr "\n

Pourquoi pas \n commencez la conversation ?

" #: templates/zerver/home.html:34 msgid "You have no private messages yet!" @@ -585,7 +588,7 @@ msgstr "Vous n'avez aucun message privé avec cette personne pour le moment !" #: templates/zerver/home.html:50 msgid "You have no group private messages with this person yet!" -msgstr "" +msgstr "Vous n'avez aucun groupe de messages privés avec cette personne pour le moment !" #: templates/zerver/home.html:58 msgid "You have no private messages with these people yet!" @@ -687,7 +690,7 @@ msgstr "" #: templates/zerver/integrations/index.html:46 msgid "Search integrations" -msgstr "" +msgstr "Recherche d'intégrations" #: templates/zerver/integrations/index.html:53 msgid "Filter by category" @@ -715,7 +718,7 @@ msgstr "Il n'y a pas d'organisation Zulip hébergée par ce sous-domaine." #: templates/zerver/invite_user.html:6 msgid "Invite users to Zulip" -msgstr "" +msgstr "Inviter des utilisateurs à Zulip" #: templates/zerver/invite_user.html:13 msgid "Emails (one on each line or comma-separated)" @@ -745,7 +748,7 @@ msgstr "En cours d'invitation…" msgid "Invite" msgstr "Inviter" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Raccourcis clavier" @@ -1001,11 +1004,11 @@ msgstr "Télécharger" #: templates/zerver/login.html:27 msgid "Sign in to Zulip" -msgstr "" +msgstr "Connexion à Zulip" #: templates/zerver/login.html:35 msgid "Sign in with SSO" -msgstr "" +msgstr "Connexion avec SSO" #: templates/zerver/login.html:82 msgid "Email or username" @@ -1023,7 +1026,7 @@ msgstr "Mot de passe" #: templates/zerver/login.html:106 msgid "" "You've already registered with this email address. Please sign in below." -msgstr "" +msgstr "Vous êtes déjà enregistré avec cette adresse mail. Veuillez vous connecter ci-dessous." #: templates/zerver/login.html:116 msgid "Sign in" @@ -1035,21 +1038,21 @@ msgstr "Connexion avec Google" #: templates/zerver/login.html:136 msgid "Sign in with GitHub" -msgstr "" +msgstr "S'identifier avec GitHub" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Formatage du message" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Vous écrivez" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "Vous avez" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1057,7 +1060,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1070,81 +1073,111 @@ msgstr "" msgid "Message edit history" msgstr "Historique de modification du message " -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "Activer les notifications" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "Rechercher" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "Quitter la recherche" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" -msgstr "Rechercher de l'aide" +msgstr "Rechercher dans l'aide" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "Menu" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "Gérer les canaux" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "Paramètres" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "Gérer l'organisation" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "Documentation de l'utilisateur" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "Opérateurs de recherche" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "Applications de bureau & mobile" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "Documentation de l'API" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "Statistiques" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "Réaction" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "Inviter des utilisateurs" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "Se déconnecter" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1154,14 +1187,14 @@ msgstr "Zulip" msgid "Log in" msgstr "S'identifier" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1174,7 +1207,7 @@ msgstr "" msgid "" "Zulip is open source, so you can install your own Zulip server by following " "the instructions on www.zulip.org" -msgstr "" +msgstr "Zulip est open-source, vous pouvez installer votre propre serveur Zulip en suivant les instructions suivantes sur www.zulip.org" #: templates/zerver/register.html:20 msgid "" @@ -1211,14 +1244,14 @@ msgid "Shorter is better than longer." msgstr "Court est mieux que long." #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "Sous-domaine" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1260,7 +1293,7 @@ msgstr "" #: templates/zerver/reset_emailed.html:13 msgid "Check your email to finish the process." -msgstr "" +msgstr "Vérifiez votre messagerie pour finaliser le processus." #: templates/zerver/reset_emailed.html:13 msgid "(Or don't, but then why did you fill out this form?)" @@ -1280,15 +1313,15 @@ msgstr "Inviter d'autres utilisateurs" #: templates/zerver/right_sidebar.html:27 msgid "GROUP PMs" -msgstr "" +msgstr "GROUPE MP" #: templates/zerver/search_operators.html:7 msgid "Operator" -msgstr "" +msgstr "Opérateur" #: templates/zerver/search_operators.html:8 msgid "Effect" -msgstr "" +msgstr "Effet" #: templates/zerver/search_operators.html:13 msgid "Narrow to messages on stream" @@ -1304,7 +1337,7 @@ msgstr "Restreindre aux messages privés avec" #: templates/zerver/search_operators.html:25 msgid "Narrow to group private messages with" -msgstr "" +msgstr "Restreindre les groupes de messages privés avec" #: templates/zerver/search_operators.html:29 msgid "Narrow to messages sent by" @@ -1369,13 +1402,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1453,7 +1496,7 @@ msgstr "Modifier robot" #: templates/zerver/settings_sidebar.html:12 msgid "Bot email" -msgstr "" +msgstr "Robot courriel" #: templates/zerver/settings_sidebar.html:22 msgid "Owner" @@ -1475,14 +1518,14 @@ msgstr "Retirer l'avatar" msgid "Save" msgstr "Sauver" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1493,7 +1536,7 @@ msgstr "" msgid "" "Hi there! It looks like you tried to unsubscribe from something, but we don't\n" "recognize the URL." -msgstr "" +msgstr "Hey ! Il semble que vous avez essayé de vous désabonner de quelque chose mais nous ne\nreconnaissons pas l'URL" #: templates/zerver/unsubscribe_link_error.html:10 #, python-format @@ -1537,62 +1580,57 @@ msgid "" "

Your organization has been migrated from zulip.com to zulipchat.com! New service, same great conversation. We just need you to do one last thing.

\n" "

Accept the Zulip terms of service

\n" " " -msgstr "" +msgstr "\n

Votre organisation a été migrée de zulip.com à zulipchat.com! Nouveau service, aussi bonne conversation. Nous avons juste besoin d'une dernière action de votre part.

\n

Accepter les conditions d'utilisation de Zulip

\n " -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" -msgstr "Serveur Zulip invalide : %s" - -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "Clé API invalide" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "Compte non actif" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" -msgstr "" +msgstr "Le compte n'est pas associé avec ce sous-domaine." -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "Clé API invalide" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "Pas connecté" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "Accès refusé" @@ -1602,177 +1640,177 @@ msgstr "" #: zerver/forms.py:56 msgid "Subdomain cannot start or end with a '-'." -msgstr "" +msgstr "Le sous-domaine ne peut pas démarrer ou se terminer avec un '-'." #: zerver/forms.py:57 msgid "Subdomain can only have lowercase letters, numbers, and '-'s." -msgstr "" +msgstr "Le sous-domaine ne peut contenir que des lettres minuscules, des nombres et des '-'." #: zerver/forms.py:58 msgid "Subdomain unavailable. Please choose a different one." -msgstr "" +msgstr "Le sous-domaine est indisponible. Veuillez en choisir un différent." -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "Merci d'utiliser votre véritable courriel." -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "Ajouter jusqu'à 10 courriels séparés par une virgule." -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "Merci d'entrer au maximum 10 courriels." -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "Impossible d'afficher le message" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "Paramètre manquant : 'à' (destinataire)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." -msgstr "" +msgstr "Bienvenue à #**%s**." -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "Description" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "salut" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "L'utilisateur n'est pas autorisé pour cette requête" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." -msgstr "" +msgstr "'%s' n'utilise plus Zulip." -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "Vous ne pouvez pas envoyer de messages privés en dehors de votre organisation." -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "Nom du canal invalide '%s'" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "Nom du canal trop long (limite : %s caractères)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "Le nom du canal '%s' contient NULL (0x00) caractères." -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "Le message ne doit pas être vide" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "Sujet manquant" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "Le sujet ne doit pas être vide" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "Le canal '%(stream_name)s' n'existe pas" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "Le message doit avoir un destinataire" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "Type de message invalide" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "Permission insuffisante" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "Message(s) invalide(s)" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "Courriel invalide." -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "En-dehors de votre domaine." -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Certains courriels ne sont pas valides, nous avons donc envoyé aucune invitation." -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "Nous n'avons pas été capable d'inviter quelqu’un." -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1785,7 +1823,7 @@ msgstr "Courriel invalide '%s'" #: zerver/lib/addressee.py:92 msgid "Cannot send to multiple streams" -msgstr "" +msgstr "Impossible d'envoyer sur plusieurs canaux." #: zerver/lib/addressee.py:104 msgid "Missing stream" @@ -1833,7 +1871,7 @@ msgstr "L'emoji '%s' n'existe pas" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "Caractères invalides dans le nom de l'emoji" @@ -1845,73 +1883,77 @@ msgstr "Type de paramètre invalide" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 -msgid "Continuous integration" -msgstr "" - #: zerver/lib/integrations.py:38 +msgid "Continuous integration" +msgstr "Intégration continue" + +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 -msgid "Deployment" -msgstr "" - #: zerver/lib/integrations.py:40 -msgid "Communication" -msgstr "" +msgid "Deployment" +msgstr "Déploiement" #: zerver/lib/integrations.py:41 -msgid "Financial" -msgstr "" +msgid "Communication" +msgstr "Communication" #: zerver/lib/integrations.py:42 +msgid "Financial" +msgstr "Financier" + +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 -msgid "Project management" -msgstr "" - #: zerver/lib/integrations.py:47 -msgid "Productivity" -msgstr "" +msgid "Project management" +msgstr "Management du projet" #: zerver/lib/integrations.py:48 -msgid "Version control" -msgstr "" +msgid "Productivity" +msgstr "Productivité" #: zerver/lib/integrations.py:49 +msgid "Version control" +msgstr "Contrôle de version" + +#: zerver/lib/integrations.py:50 msgid "Interactive bots" -msgstr "" +msgstr "Bots interactifs" #: zerver/lib/narrow.py:12 #, python-format msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1953,7 +1995,7 @@ msgstr "Le nom canal '%s' est déjà utilisé" #: zerver/lib/streams.py:208 msgid "User cannot create streams." -msgstr "" +msgstr "L'utilisateur ne peut pas créer de canaux." #: zerver/lib/streams.py:210 #, python-format @@ -1980,7 +2022,7 @@ msgstr "Nom trop court !" msgid "Invalid characters in name!" msgstr "Caractères invalides dans le nom !" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "Mauvais nom ou nom d'utilisateur" @@ -2020,7 +2062,7 @@ msgstr "" #: zerver/lib/validator.py:84 #, python-format msgid "%s is not a list" -msgstr "" +msgstr "%s n'est pas une liste" #: zerver/lib/validator.py:87 #, python-format @@ -2052,56 +2094,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2110,15 +2152,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" +msgstr "Session inconnue ou inexistante" + +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2153,49 +2199,49 @@ msgstr "" #: zerver/views/auth.py:224 msgid "Wrong subdomain" -msgstr "" +msgstr "Mauvais sous-domaine" #: zerver/views/auth.py:265 msgid "Invalid OTP" -msgstr "" +msgstr "OTP invalide" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "Votre compte a été désactivé" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "Cet utilisateur n'est pas inscrit." -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "Votre nom d'utilisateur ou mot de passe est incorrect." -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" -msgstr "" +msgstr "Sous-domaine invalide" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" -msgstr "" +msgstr "Sous-domaine requis" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2223,7 +2269,7 @@ msgstr "" #: zerver/views/hotspots.py:16 #, python-format msgid "Unknown hotspot: %s" -msgstr "" +msgstr "Hotspot inconnu : %s" #: zerver/views/invite.py:27 msgid "You must specify at least one email address." @@ -2243,49 +2289,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2299,7 +2345,7 @@ msgstr "" #: zerver/views/pointer.py:29 msgid "Invalid message ID" -msgstr "" +msgstr "ID de message invalide" #: zerver/views/presence.py:30 zerver/views/presence.py:32 #: zerver/views/users.py:38 zerver/views/users.py:40 zerver/views/users.py:81 @@ -2330,11 +2376,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2381,17 +2427,17 @@ msgstr "" #: zerver/views/realm_filters.py:45 msgid "Filter not found" -msgstr "" +msgstr "Filtre introuvable" #: zerver/views/realm_icon.py:19 msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2402,7 +2448,7 @@ msgstr "" #: zerver/views/streams.py:97 msgid "Stream already has that name!" -msgstr "" +msgstr "Le canal a déjà ce nom !" #: zerver/views/streams.py:119 msgid "Nothing to do. Specify at least one of \"add\" or \"delete\"." @@ -2436,10 +2482,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2479,7 +2521,7 @@ msgstr "Mot de passe incorrect !" #: zerver/views/user_settings.py:129 msgid "Check your email for a confirmation link. " -msgstr "" +msgstr "Vérifiez votre email pour un lien de confirmation." #: zerver/views/user_settings.py:159 #, python-format @@ -2511,12 +2553,12 @@ msgstr "" msgid "Username already in use" msgstr "Nom d'utilisateur déjà utilisé" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "Courriel '%s' déjà utilisé" @@ -2569,7 +2611,7 @@ msgstr "" #: zerver/webhooks/pingdom/view.py:45 #, python-brace-format msgid "Unsupported check_type: {check_type}" -msgstr "" +msgstr "check_type: {check_type} non supporté " #: zerver/webhooks/pivotal/view.py:174 msgid "Unable to handle Pivotal payload" @@ -2581,7 +2623,7 @@ msgstr "" #: zerver/webhooks/slack/view.py:30 msgid "Message from Slack" -msgstr "" +msgstr "Message de Slack" #: zerver/webhooks/stripe/view.py:160 msgid "We don't support {} event" @@ -2605,10 +2647,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/fr/translations.json b/static/locale/fr/translations.json index 2289a16d35..22f4e97814 100644 --- a/static/locale/fr/translations.json +++ b/static/locale/fr/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "\"__file_name__\" est trop grand ; la taille maximale d'un fichier est de 25Mo.", + "(This user has been deactivated)": "", "(no topic)": "(pas de sujet)", "24-hour time (17:00 instead of 5:00 PM)": "Format 24 heures (17:00 au lieu de 5:00 PM)", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "Privé : doit être invité par un membre ; les nouveaux membres peuvent voir uniquement les messages envoyés après leur arrivée ; caché pour les utilisateurs non administrateurs", @@ -189,6 +190,7 @@ "Filter settings": "Filtrer les paramètres", "Filter streams": "Filtrer les canaux", "Filter users": "Filtrer les utilisateurs", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "Pour plus d'information sur les canaux publics/privés, visiter notre documentation.", "Forgotten it?": "Oublier?", "Formatting": "Formater", @@ -287,12 +289,11 @@ "No default streams match you current filter.": "Aucun canal par défaut ne correspond à votre filtre actuel.", "No description.": "Aucune description.", "No drafts.": "Aucun brouillon.", - "No more topics.": "", + "No more topics.": "Plus de sujets.", "No streams match your current filter.": "Aucun canal ne correspond à votre filtre actuel.", "No users match your current filter.": "Aucun utilisateur ne correspond à votre filtre.", "None": "Aucun", "Note that any bots that you maintain will be disabled.": "Notez que tous les robots que vous maintenez seront désactivés.\n", - "Nothing selected.": "Rien n'est sélectionné.", "Nothing to preview": "Rien à prévisualiser", "Notifications": "Notifications", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "Les notifications sont déclenchées lorsqu'un message arrive et que Zulip n'est pas actif ou que le message est hors de l'écran.", @@ -509,4 +510,4 @@ "more topics": "plus de sujets", "right": "droite", "text": "texte" -} +} \ No newline at end of file diff --git a/static/locale/hi/LC_MESSAGES/django.po b/static/locale/hi/LC_MESSAGES/django.po index e50e6d9183..ca4d79cec9 100644 --- a/static/locale/hi/LC_MESSAGES/django.po +++ b/static/locale/hi/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Hindi (http://www.transifex.com/zulip/zulip/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,17 +18,17 @@ msgstr "" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "" @@ -192,7 +192,7 @@ msgstr "" #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "" @@ -390,11 +390,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "" @@ -460,15 +460,15 @@ msgid "Login" msgstr "" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "गोपनीयता नीति" @@ -480,7 +480,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "" @@ -496,11 +496,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "" @@ -740,7 +740,7 @@ msgstr "" msgid "Invite" msgstr "" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "" @@ -1032,19 +1032,19 @@ msgstr "Google के साथ साइन इन करें" msgid "Sign in with GitHub" msgstr "" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1052,7 +1052,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1065,81 +1065,111 @@ msgstr "" msgid "Message edit history" msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "सूचना सक्षम करें" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "खोज" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "सेटिंग्स" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "" @@ -1149,14 +1179,14 @@ msgstr "" msgid "Log in" msgstr "" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1206,14 +1236,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1364,13 +1394,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1470,14 +1510,14 @@ msgstr "" msgid "Save" msgstr "" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1534,60 +1574,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1607,167 +1642,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1828,7 +1863,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1840,59 +1875,59 @@ msgstr "" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1901,12 +1936,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1975,7 +2014,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2047,56 +2086,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2105,15 +2144,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2154,43 +2197,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2238,49 +2281,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2325,11 +2368,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2382,11 +2425,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2431,10 +2474,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2506,12 +2545,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2600,10 +2639,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/hi/translations.json b/static/locale/hi/translations.json index c34534e49f..95ac900555 100644 --- a/static/locale/hi/translations.json +++ b/static/locale/hi/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "", "Formatting": "", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", diff --git a/static/locale/hu/LC_MESSAGES/django.po b/static/locale/hu/LC_MESSAGES/django.po index 5da0806da1..2b1549f93a 100644 --- a/static/locale/hu/LC_MESSAGES/django.po +++ b/static/locale/hu/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Hungarian (http://www.transifex.com/zulip/zulip/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,17 +18,17 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Ismeretlen diagram: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "Az induló dátum későbbi mint a befejezés dátuma. Indulás: %(start)s, befejezés: %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "" @@ -192,7 +192,7 @@ msgstr "Ellenőrizd a Spam mappát is." #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Bezár" @@ -390,11 +390,11 @@ msgstr "Igen, töröljük ezt az üzenetet" msgid "(Or visit the normal login page)" msgstr "(Vagy látogasd meg az alap belépési oldalt)" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Adminisztrátorok" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Normál felhasználók" @@ -460,15 +460,15 @@ msgid "Login" msgstr "" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -480,7 +480,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "" @@ -496,11 +496,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "" @@ -740,7 +740,7 @@ msgstr "" msgid "Invite" msgstr "" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "" @@ -1032,19 +1032,19 @@ msgstr "" msgid "Sign in with GitHub" msgstr "" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1052,7 +1052,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1065,81 +1065,111 @@ msgstr "" msgid "Message edit history" msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "Keresés" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "Kijelentkezés" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1149,14 +1179,14 @@ msgstr "Zulip" msgid "Log in" msgstr "Bejelentkezés" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1206,14 +1236,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1364,13 +1394,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1470,14 +1510,14 @@ msgstr "" msgid "Save" msgstr "Mentés" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1534,60 +1574,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1607,167 +1642,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1828,7 +1863,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1840,59 +1875,59 @@ msgstr "" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1901,12 +1936,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1975,7 +2014,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2047,56 +2086,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2105,15 +2144,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2154,43 +2197,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2238,49 +2281,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2325,11 +2368,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2382,11 +2425,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2431,10 +2474,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2506,12 +2545,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2600,10 +2639,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/hu/translations.json b/static/locale/hu/translations.json index 5b2e622365..b3ffa624ae 100644 --- a/static/locale/hu/translations.json +++ b/static/locale/hu/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "", "Formatting": "Formázás", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "Értesítések", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", @@ -509,4 +510,4 @@ "more topics": "", "right": "", "text": "" -} +} \ No newline at end of file diff --git a/static/locale/it/LC_MESSAGES/django.po b/static/locale/it/LC_MESSAGES/django.po index 60a9d967ce..9f41566e99 100644 --- a/static/locale/it/LC_MESSAGES/django.po +++ b/static/locale/it/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-06 17:07+0000\n" +"POT-Creation-Date: 2017-10-20 17:27+0000\n" "PO-Revision-Date: 2017-09-04 03:34+0000\n" "Last-Translator: Greg Price \n" "Language-Team: Italian (http://www.transifex.com/zulip/zulip/language/it/)\n" @@ -192,7 +192,7 @@ msgstr "" #: templates/zerver/bankruptcy.html:5 templates/zerver/delete_message.html:3 #: templates/zerver/invite_user.html:5 templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Chiudi" @@ -394,11 +394,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Amministratori" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Utenti normali" @@ -464,15 +464,15 @@ msgid "Login" msgstr "Login" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -484,7 +484,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "" @@ -500,11 +500,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "" @@ -746,7 +746,7 @@ msgstr "" msgid "Invite" msgstr "" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "" @@ -1038,19 +1038,19 @@ msgstr "" msgid "Sign in with GitHub" msgstr "" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first server's " -"administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured " +"privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1216,14 +1246,19 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:108 +#, python-format +msgid "Use %(external_host)s" +msgstr "" + +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms " @@ -1375,16 +1410,24 @@ msgid "" "

You can use any combination of these search operators in a single " "query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword." -"

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1484,16 +1527,16 @@ msgstr "" msgid "Save" msgstr "" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of " -"service.\n" -" Contact this server's " -"administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured " +"terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1555,60 +1598,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1628,167 +1666,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 zerver/views/users.py:84 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 zerver/views/users.py:84 #: zerver/views/users.py:100 zerver/views/users.py:170 #: zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:293 zerver/lib/message.py:304 -#: zerver/lib/message.py:309 zerver/lib/message.py:313 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1848,7 +1886,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1856,63 +1894,63 @@ msgstr "" msgid "Invalid type parameter" msgstr "" -#: zerver/lib/events.py:509 +#: zerver/lib/events.py:510 msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1921,12 +1959,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1995,7 +2037,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2067,56 +2109,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2125,15 +2167,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2174,43 +2220,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2258,49 +2304,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2344,11 +2390,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2401,11 +2447,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2521,12 +2567,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2615,10 +2661,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/it/translations.json b/static/locale/it/translations.json index 372e30386f..fa302f30da 100644 --- a/static/locale/it/translations.json +++ b/static/locale/it/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "", "Formatting": "", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", diff --git a/static/locale/ja/LC_MESSAGES/django.po b/static/locale/ja/LC_MESSAGES/django.po index 218b126c34..730bcb391a 100644 --- a/static/locale/ja/LC_MESSAGES/django.po +++ b/static/locale/ja/LC_MESSAGES/django.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Japanese (http://www.transifex.com/zulip/zulip/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,17 +20,17 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "不明なチャート名: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "開始時間が終了時間よりも先の日時です。開始時間: %(start)s、終了時間: %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "解析用データが利用できません。サーバー管理者に連絡してください。" @@ -194,7 +194,7 @@ msgstr "念のため、迷惑メールフォルダーを確認してください #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "閉じる" @@ -392,11 +392,11 @@ msgstr "はい。このメッセージを削除します" msgid "(Or visit the normal login page)" msgstr "(または 通常のログインページ へ移動する)" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "管理者" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "一般ユーザー" @@ -462,15 +462,15 @@ msgid "Login" msgstr "ログイン" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "登録" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "サービス利用規約" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "プライバシーポリシー" @@ -482,7 +482,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "インテグレーション" @@ -498,11 +498,11 @@ msgstr "オープンソースプロジェクトのベストチャート" msgid "The best chat for working groups and communities" msgstr "ワーキンググループとコミュニティのベストチャート" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "すぐにログイン！" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "すぐに登録！" @@ -742,7 +742,7 @@ msgstr "招待中..." msgid "Invite" msgstr "招待" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "キーボードショートカット" @@ -1034,19 +1034,19 @@ msgstr "Googleアカウントで登録" msgid "Sign in with GitHub" msgstr "GitHubで登録" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "メッセージのフォーマット" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "入力" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "出力" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1054,7 +1054,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1067,81 +1067,111 @@ msgstr "" msgid "Message edit history" msgstr "メッセージの編集履歴" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "通知を有効" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "検索" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "検索から出る" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "ヘルプを検索" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "メニュー" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "ストリームを管理" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "設定" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "組織を管理" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "ユーザードキュメント" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "検索のオペレーター" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "デスクトップアプリとモバイルアプリ" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "APIドキュメント" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "統計" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "フィードバック" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "ユーザーを招待" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "Webathenaとつながる" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "ログアウト" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "デバッグ" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1151,14 +1181,14 @@ msgstr "Zulip" msgid "Log in" msgstr "ログイン" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1208,14 +1238,14 @@ msgid "Shorter is better than longer." msgstr "長いより短い方が良い" #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "サブドメイン" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "この組織に登録するために使うアドレス。" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1366,13 +1396,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1472,15 +1512,15 @@ msgstr "アバターを消去" msgid "Save" msgstr "保存" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " -msgstr "\nこのZulipのインストールはサービス利用規約の設定がありません。もし質問があれば、この サーバー管理者 に連絡してください。" +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " +msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 msgid "Unknown email unsubscribe request" @@ -1536,60 +1576,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "realm管理者でなければなりません" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" -msgstr "不正なZulipサーバー: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" +msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "不正なAPIキー" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "このAPIキーはルートサブドメインでのみ動作します" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "このAPIはincoming webhookボットに利用できません。" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "アカウントは有効ではありません" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "アカウントのrealmは無効化されています" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "アカウントはこのサブドメインに関連付けられていません" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "不正なAPIキー" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "このエンドポイントはボットからのリクエストを受け付けません。" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "このエンドポイントはHTTPのベーシック認証を必要とします。" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "不正なベーシック認証の認証ヘッダー" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "ログインしていません" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "Webhookボットはwebhookだけにアクセスできます" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "アクセスが拒否されました" @@ -1609,167 +1644,167 @@ msgstr "サブドメインには小文字と数字と '-' だけが使えます msgid "Subdomain unavailable. Please choose a different one." msgstr "サブドメインは利用できません。別のものを選択してください。" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "{email} で参加しようとしている組織が存在しません。" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "組織の管理者から {email} を招待してもらうようにしてください。" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "あなたのメールアドレス {email} はこの組織のアカウントに登録できるドメインではありません。" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "本物のメールアドレスを使ってください。" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "カンマ区切りで10個までメールアドレスを追加してください。" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "最大10個のメールアドレスを入力してください。" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "メッセージをレンダリングできません" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "パラメーターがありません: 'to' (受信者)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "#**%s** へようこそ。" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "説明" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "こんにちはー" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "このクエリーを許可されていないユーザーです" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "'%s' はZulipを使っていません。" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "組織の外部からプライベートメッセージを送信できません。" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "不正なストリーム名 '%s'" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "ストリーム名が長すぎます (制限: %s 文字)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "ストリーム名 '%s' がNULL文字 (0x00) を含んでいます。" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "メッセージを入力する必要があります" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "トピックがありません" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "トピックを入力してください" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "ストリーム '%(stream_name)s' は存在しません" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "ストリーム '%s' への送信は許可されていません" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "不正なメッセージ種別" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "このrealmは公開ストリームの購読者を取得できません" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "招待専用ストリームの購読者は取得できません" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "権限が足りません" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "不正なメッセージ" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "不正なメールアドレス" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "ドメイン外です。" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1830,7 +1865,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "絵文字名に不正な文字" @@ -1842,59 +1877,59 @@ msgstr "不正な種別パラメーター" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "インテグレーションフレームワーク" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "継続的インテグレーション" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "顧客サポート" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "デプロイ" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "コミュニケーション" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "財務" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "人事" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "マーケティング" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "その他" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "監視ツール" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "プロジェクト管理" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "生産性" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "バージョン管理" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1903,12 +1938,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "オペレーター %s はサポートされていません。" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "トークンがありません" @@ -1977,7 +2016,7 @@ msgstr "名前が短すぎます！" msgid "Invalid characters in name!" msgstr "名前に不正な文字があります！" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "許容できない名前またはユーザー名" @@ -2049,56 +2088,56 @@ msgstr "%s は allowed_type ではありません" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (%(value)s が間違っています)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "内部のサーバーエラー" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "CSRF エラー: {reason}" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "API使用量が制限を超えました" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "Appleスタイル" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "Emoji Oneスタイル" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "Googleスタイル" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "Twitterスタイル" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "Unicode絵文字" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "Realm絵文字" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "Zulip拡張絵文字" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "'queue_id' 引数がありません" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "'last_event_id' 引数がありません" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "このキューからイベントを取得することが許可されていません" @@ -2107,15 +2146,19 @@ msgstr "このキューからイベントを取得することが許可されて msgid "Bad event queue id: {queue_id}" msgstr "不正なイベントキューID: {queue_id}" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "不明なセッションまたはセッションがありません" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2156,43 +2199,43 @@ msgstr "誤ったサブドメイン" msgid "Invalid OTP" msgstr "不正なOTP" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "このユーザーは登録されていません。" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "チームのパスワード認証は無効です。" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "このユーザーは登録されていません。ブラウザから操作してください。" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "ユーザー名かパスワードが間違っています。" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "不正なサブドメイン" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "サブドメインが必要です" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2240,49 +2283,49 @@ msgstr "%s ストリームは存在しません。招待は送信されません msgid "Invalid narrow operator: {desc}" msgstr "不正な絞り込みオペレーター: {desc}" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "送信者がいません" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "不正なミラーリングされたメッセージ" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "不正なミラーリングされたrealm" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "IRC ストリームの名前は # で始める必要があります" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "この組織のメッセージの編集履歴は無効です" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "組織のメッセージ編集を禁止しました" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "このメッセージを編集する権限がありません" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "このメッセージを編集できる期限を過ぎました" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2327,11 +2370,11 @@ msgstr "空か、トークンの長さが不正です" msgid "Invalid APNS token" msgstr "不正なAPNSトークン" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "リアクションはすでに存在します" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "リアクションは存在しません" @@ -2384,11 +2427,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "アイコンは1つだけアップロードしてください。" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "組織の新規作成を無効にしました。" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "組織作成リンクは期限切れか、無効になっています。" @@ -2433,10 +2476,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "ストリームID %d は購読していません" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2508,12 +2547,12 @@ msgstr "組織の管理者だけが削除できます" msgid "Username already in use" msgstr "ユーザー名は使用済みです" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2602,10 +2641,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "不正なトークン種別" diff --git a/static/locale/ja/translations.json b/static/locale/ja/translations.json index 390062a2f5..95b7fa5873 100644 --- a/static/locale/ja/translations.json +++ b/static/locale/ja/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "\"__file_name__\" が大きすぎます。最大ファイルサイズは 25MiB です。", + "(This user has been deactivated)": "", "(no topic)": "(無名トピック)", "24-hour time (17:00 instead of 5:00 PM)": "24 時間表記 (5:00 PM ではなく 17:00)", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "プライベート: はメンバーが招待する必要があります。新しいメンバーは参加した後のメッセージのみ表示されます。非管理者メンバーからは隠蔽されます。", @@ -189,6 +190,7 @@ "Filter settings": "フィルターの設定", "Filter streams": "ストリームをフィルター", "Filter users": "ユーザーを絞り込み", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "公開/プライベートのストリームの詳細については ドキュメントを確認してください。", "Forgotten it?": "忘れましたか？", "Formatting": "フォーマット", @@ -292,7 +294,6 @@ "No users match your current filter.": "ユーザーがフィルターに一致しません。", "None": "なし", "Note that any bots that you maintain will be disabled.": "あなたがメンテナンスしているボットが無効になることに注意してください。", - "Nothing selected.": "選択されていません。", "Nothing to preview": "プレビューするものがありません。", "Notifications": "通知", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "メッセージが届いてZulipがフォーカスしない、または画面上に表示されないときに通知されます。", @@ -509,4 +510,4 @@ "more topics": "もっとトピックを見る", "right": "右", "text": "テキスト" -} +} \ No newline at end of file diff --git a/static/locale/ko/LC_MESSAGES/django.po b/static/locale/ko/LC_MESSAGES/django.po index bc4d49f4af..ae45e1d75a 100644 --- a/static/locale/ko/LC_MESSAGES/django.po +++ b/static/locale/ko/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-06 17:07+0000\n" +"POT-Creation-Date: 2017-10-20 17:27+0000\n" "PO-Revision-Date: 2017-09-04 03:34+0000\n" "Last-Translator: Greg Price \n" "Language-Team: Korean (http://www.transifex.com/zulip/zulip/language/ko/)\n" @@ -193,7 +193,7 @@ msgstr "" #: templates/zerver/bankruptcy.html:5 templates/zerver/delete_message.html:3 #: templates/zerver/invite_user.html:5 templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "" @@ -395,11 +395,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "" @@ -465,15 +465,15 @@ msgid "Login" msgstr "" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -485,7 +485,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "" @@ -501,11 +501,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "로그인하세요!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "가입하세요!" @@ -747,7 +747,7 @@ msgstr "" msgid "Invite" msgstr "" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "" @@ -1039,19 +1039,19 @@ msgstr "" msgid "Sign in with GitHub" msgstr "" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first server's " -"administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured " +"privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1217,14 +1247,19 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:108 +#, python-format +msgid "Use %(external_host)s" +msgstr "" + +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms " @@ -1376,16 +1411,24 @@ msgid "" "

You can use any combination of these search operators in a single " "query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword." -"

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1485,16 +1528,16 @@ msgstr "" msgid "Save" msgstr "" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of " -"service.\n" -" Contact this server's " -"administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured " +"terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1556,60 +1599,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1629,167 +1667,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 zerver/views/users.py:84 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 zerver/views/users.py:84 #: zerver/views/users.py:100 zerver/views/users.py:170 #: zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:293 zerver/lib/message.py:304 -#: zerver/lib/message.py:309 zerver/lib/message.py:313 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1849,7 +1887,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1857,63 +1895,63 @@ msgstr "" msgid "Invalid type parameter" msgstr "" -#: zerver/lib/events.py:509 +#: zerver/lib/events.py:510 msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1922,12 +1960,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1996,7 +2038,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2068,56 +2110,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2126,15 +2168,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2175,43 +2221,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2259,49 +2305,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2345,11 +2391,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2402,11 +2448,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2522,12 +2568,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2616,10 +2662,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/ko/translations.json b/static/locale/ko/translations.json index 2e538b17e9..2814d8a13b 100644 --- a/static/locale/ko/translations.json +++ b/static/locale/ko/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "", "Formatting": "", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", diff --git a/static/locale/ml/LC_MESSAGES/django.po b/static/locale/ml/LC_MESSAGES/django.po index 76475d5018..3fcf629302 100644 --- a/static/locale/ml/LC_MESSAGES/django.po +++ b/static/locale/ml/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Malayalam (http://www.transifex.com/zulip/zulip/language/ml/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,17 +19,17 @@ msgstr "" "Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "അനലിറ്റിക്സ് ഡാറ്റയൊന്നും ലഭ്യമല്ല. ദയവായി നിങ്ങളുടെ സെർവർ അഡ്മിനിസ്ട്രേറ്ററെ ബന്ധപ്പെടുക." @@ -193,7 +193,7 @@ msgstr "" #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "" @@ -391,11 +391,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "നടത്തിപ്പുകാർ" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "സാധാരണ ഉപയോക്താക്കൾ" @@ -461,15 +461,15 @@ msgid "Login" msgstr "" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "രെജിസ്റ്റർ" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "സേവന നിബന്ധനകൾ" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -481,7 +481,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "" @@ -497,11 +497,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "ഇപ്പോൾ തന്നെ രെജിസ്റ്റർ ചെയ്യൂ" @@ -741,7 +741,7 @@ msgstr "" msgid "Invite" msgstr "ക്ഷണിക്കൂ" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "കീബോർഡ് എളുപ്പവഴികൾ" @@ -1033,19 +1033,19 @@ msgstr "ഗൂഗിളുപയോഗിച്ച് സൈനിൻ ചെയ msgid "Sign in with GitHub" msgstr "" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "നിങ്ങൾ ടൈപ്പ് ചെയ്യൂ" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "നിങ്ങൾക്ക് കിട്ടും" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1053,7 +1053,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1066,81 +1066,111 @@ msgstr "" msgid "Message edit history" msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "തിരയുക" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "സഹായം തിരിയുക" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "സജ്ജീകരണങ്ങൾ" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "" @@ -1150,14 +1180,14 @@ msgstr "" msgid "Log in" msgstr "ലൊഗിൻ" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1207,14 +1237,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1365,13 +1395,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1471,14 +1511,14 @@ msgstr "അവതാർ കളയുക" msgid "Save" msgstr "സേവ് ചെയ്യുക" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1535,60 +1575,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1608,167 +1643,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1829,7 +1864,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1841,59 +1876,59 @@ msgstr "" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1902,12 +1937,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1976,7 +2015,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2048,56 +2087,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2106,15 +2145,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2155,43 +2198,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2239,49 +2282,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2326,11 +2369,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2383,11 +2426,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2432,10 +2475,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2507,12 +2546,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2601,10 +2640,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/ml/translations.json b/static/locale/ml/translations.json index e8d076e909..2e96b94afe 100644 --- a/static/locale/ml/translations.json +++ b/static/locale/ml/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "\"__file_name__\" വളരെ വലുതാണ്. അനുവദനീയമായ പരമാവധി ഫയൽ വലുപ്പം 25MiB ആണ്.", + "(This user has been deactivated)": "", "(no topic)": "(വിഷയം ഇല്ല)", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "അതു മറന്നുപോയോ?", "Formatting": "", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "അറിയിപ്പുകൾ", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", @@ -509,4 +510,4 @@ "more topics": "കൂടുതൽ വിഷയങ്ങൾ", "right": "", "text": "" -} +} \ No newline at end of file diff --git a/static/locale/nl/LC_MESSAGES/django.po b/static/locale/nl/LC_MESSAGES/django.po index a9b05b3ea9..ebe7c52c96 100644 --- a/static/locale/nl/LC_MESSAGES/django.po +++ b/static/locale/nl/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Dutch (http://www.transifex.com/zulip/zulip/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,17 +18,17 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Onbekende grafieknaam: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "Starttiijd ligt na de eindtijd. Start: %(start)s, Eind: %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "" @@ -192,7 +192,7 @@ msgstr "Voor de zekerheid kun je evenin je Spammapje kijken." #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Sluiten" @@ -390,11 +390,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Beheerders" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Gewone gebruikers" @@ -460,15 +460,15 @@ msgid "Login" msgstr "Inloggen" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Registreren" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -480,7 +480,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Integraties" @@ -496,11 +496,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "Nu inloggen!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "Meld je nu aan!" @@ -740,7 +740,7 @@ msgstr "" msgid "Invite" msgstr "Uitnodigen" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Toetsenbord sneltoetsen" @@ -1032,19 +1032,19 @@ msgstr "Inloggen met Google" msgid "Sign in with GitHub" msgstr "Inloggen met GitHub" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Berichtopmaak" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Je typt" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "Je krijgt" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1052,7 +1052,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1065,81 +1065,111 @@ msgstr "" msgid "Message edit history" msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "Zoeken" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "Hulp zoeken" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "Kanalen beheren" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "Instellingen" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "Gebruikersdocumentatie" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "Zoek opdrachten" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "Desktop & mobiele apps" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "API documentatie" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "Terugkoppeling" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "Gebruikers uitnodigen" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "Verbinden met Webathena" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "Uitloggen" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "Debuggen" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1149,14 +1179,14 @@ msgstr "Zulip" msgid "Log in" msgstr "Inloggen" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1206,14 +1236,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "Subdomein" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "Het adres dat je gebruikt om je aan te melden bij je organisatie." -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1364,13 +1394,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1470,14 +1510,14 @@ msgstr "Weghalen avatar" msgid "Save" msgstr "Opslaan" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1534,60 +1574,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "Ongeldige API key" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "Account niet actief" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "Account is niet verbonden met dit subdomein" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "Ongeldige API key" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "Niet ingelogd" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "Verboden toegang" @@ -1607,167 +1642,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "Subdomein niet beschikbaar. Kies een ander." -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "Gebruik je echte e-mailadres." -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "Kan bericht niet opmaken" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "Ontbrekende parameter: 'aan' (recipient)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "Welkom bij #**%s**." -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "hallo" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "Gebruiker niet geautoriseerd voor deze opvraag" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "'%s' is geen Zulip gebruiker meer." -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "Je kunt geen privéberichten buiten je organisatie versturen." -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "Ongeldige kanaalnaam '%s'." -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "Kanaalnaam te lang (limiet: %s tekens)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "Bericht kan niet leeg zijn" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "Ontbrekend onderwerp" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "Onderwerp kan niet leeg zijn" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "Kanaal '%(stream_name)s' bestaat niet" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "Niet geautoriseerd om naar kanaal '%s' te versturen" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "Bericht moet ontvangers hebben" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "Ongeldig berichttype" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "Onvoldoende rechten" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "Ongeldig(e) bericht(en)" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "Ongeldig adres." -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "Buiten je domein." -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "Heeft al een account." -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "We konden niemand uitnodigen." -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1828,7 +1863,7 @@ msgstr "Emoji '%s' bestaat niet" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "Ongeldigetekens in emoji-naam" @@ -1840,59 +1875,59 @@ msgstr "Ongeldig type parameter" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1901,12 +1936,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "Bewerking %s niet ondersteund." -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "Token bestaat niet" @@ -1975,7 +2014,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "Verkeerde naam of gebruikersnaam" @@ -2047,56 +2086,56 @@ msgstr "%s is niet een allowed_type" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (%(value)s is verkeerd)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "Interne serverfout" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "Ontbrekend 'queue_id' argument" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "Ontbrekend 'last_event_id' argument" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2105,15 +2144,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2154,43 +2197,43 @@ msgstr "Verkeerd subdomein" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "Ontwikkelomgeving niet ingeschakeld." -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "Je account is geblokkeerd." -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "Wachtwoordauthenticatie is voor jouw team uitgeschakeld." -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "De gebruiker is niet geregistreerd, doe dat via de browser." -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "Je gebruikersnaam of wachtwoord is onjuist." -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID is niet geconfigureerd" @@ -2238,49 +2281,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "Niet zo'n onderwerp '%s'" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "Ontbrekende afzender" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "IRC kanaalnamen moeten beginnen met #" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "Je hebt niet de autorisatie om dit bericht te bewerken" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "De tijdslimiet om dit bericht te bewerken is verstreken" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "Niets om te wijzigen" @@ -2325,11 +2368,11 @@ msgstr "Leeg token of onjuiste lengte" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "Reactie bestaat al" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "reactie bestaat niet" @@ -2382,11 +2425,11 @@ msgstr "Filter niet gevonden" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2431,10 +2474,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2506,12 +2545,12 @@ msgstr "Kan de enige beheerder voor deze organisatie niet verwijderen" msgid "Username already in use" msgstr "Gebruikersnaam al in gebruik" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "E-mailadres '%s' is al in gebruik" @@ -2600,10 +2639,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/nl/translations.json b/static/locale/nl/translations.json index e7b7ac0d69..d2c1ca9bda 100644 --- a/static/locale/nl/translations.json +++ b/static/locale/nl/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "(geen onderwerp)", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "Filter kanalen", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "Vergeten?", "Formatting": "Opmaken", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "Geen", "Note that any bots that you maintain will be disabled.": "Let op: alle bots die je onderhoudt worden uitgeschakeld.", - "Nothing selected.": "Niets geselecteerd.", "Nothing to preview": "Niets te bekijken", "Notifications": "Meldingen", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", @@ -509,4 +510,4 @@ "more topics": "meer onderwerpen", "right": "rechts", "text": "" -} +} \ No newline at end of file diff --git a/static/locale/pl/LC_MESSAGES/django.po b/static/locale/pl/LC_MESSAGES/django.po index 39e615abda..decf30efce 100644 --- a/static/locale/pl/LC_MESSAGES/django.po +++ b/static/locale/pl/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Polish (http://www.transifex.com/zulip/zulip/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,17 +19,17 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Nieznana nazwa wykresu (chart): %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "Czas rozpoczęcia %(start)s późniejszy niż zakończenia %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "Dane analityczne niedostępne. Skontaktuj się z administratorem serwera." @@ -193,7 +193,7 @@ msgstr "Na wszelki wypadek sprawdź folder ze spamem." #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Zamknij" @@ -391,11 +391,11 @@ msgstr "Tak, usuń wiadomość" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Administratorzy" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Zwykli użytkownicy" @@ -461,15 +461,15 @@ msgid "Login" msgstr "Zaloguj się" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Zarejestruj się" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -481,7 +481,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Integracje" @@ -497,11 +497,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "Zaloguj się teraz!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "Zarejestruj się teraz!" @@ -741,7 +741,7 @@ msgstr "Zapraszanie..." msgid "Invite" msgstr "Zaproś" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Skróty klawiszowe" @@ -1033,19 +1033,19 @@ msgstr "Zaloguj się przez Google" msgid "Sign in with GitHub" msgstr "zaloguj się przez GitHuba" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Formatowanie wiadomości" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Piszesz" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "Widzisz" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1053,7 +1053,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1066,81 +1066,111 @@ msgstr "" msgid "Message edit history" msgstr "Historia edycji wiadomości" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "Wyszukaj" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "Zarządzaj kanałami" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "Ustawienia" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "Dokumentacja użytkownika [EN]" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "Operatory wyszukiwania" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "Aplikacje komputerowe i mobilne" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "Dokumentacja API" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "Feedback" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "Zaproś użytkowników" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "Połącz z Webathena" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "Wyloguj się" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "Debuguj" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1150,14 +1180,14 @@ msgstr "Zulip" msgid "Log in" msgstr "Zaloguj się" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1207,14 +1237,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "Subdomena" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "Adres, którego użyjesz do logowania się do organizacji." -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1365,15 +1395,25 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " -msgstr "\n

Możesz użyć kombinacji tych operatorów w jednym zapytaniu, na przykład:

\n

  stream:streamname\nsender:user@example.com\nkeyword

\n\n

będzie szukać wiadomości wysłanych przez user@example.com na kanale\nstreamname\nzawierających słowo-klucz keyword.

\n " +msgstr "" #: templates/zerver/settings_overlay.html:16 msgid "Your account" @@ -1471,14 +1511,14 @@ msgstr "Usuń awatar" msgid "Save" msgstr "Zapisz" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1535,60 +1575,55 @@ msgid "" " " msgstr "\n

Twoja organizacja zostałą przeniesiona z zulip.com do zulipchat.com! Nowa usługa, ten sam świetny kontakt. Prosimy jeszcze o jedną rzecz.

\n

Zaakceptuj warunki usługi Zulipa

\n " -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "Musisz być administratorem organizacji" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "Nieprawidłowy klucz API" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "Konto nieaktywne" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "Domena konta została dezaktyowana" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "Konto nie jest powiązane z tą subdomeną" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "Nieprawidłowy klucz API" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "Nieprawidłowy nagłówek autoryzacji dla basic auth" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "Niezalogowany" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "Boty typu webhook mają dostęp tyko do webhooków" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "Odmowa dostępu" @@ -1608,167 +1643,167 @@ msgstr "Subdomena może składać się tylko z małych liter, cyfr i znaków \"- msgid "Subdomain unavailable. Please choose a different one." msgstr "Subdomena nie jest dostępna. Wybierz inną." -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "Użyj swojego prawdziwego adresu email." -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "Nie można pokazać wiadomości" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "Brak parametru: \"do\" (odbiorca)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "Nieprawidłowa wartość 'op' (powinna być start lub stop)" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "Użytkownik nie jest uprawniony do tego zapytania." -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "'%s' nie używa już Zulipa." -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "Nie możesz wysyłać prywatnych wiadomości poza swoją organizację." -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "Nieprawidłowa nazwa kanału '%s'" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "Zbyt długa nazwa kanału (limit: %s znaków)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "Wiadomość musi mieć treść" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "Brak wątku" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "Należy określić wątek" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "Kanał \"%(stream_name)s\" nie istnieje" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "Nie masz uprawnień, aby wysyłać wiadomości na kanale '%s'" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "Wiadomość musi mieć odbiorcę" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "Nieprawidłowy typ wiadomości" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "Nie możesz mieć subskrybentów publicznych kanałów w tej organizacji" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "Nie można pobrać subskrybentów dla kanału zamkniętego" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "Niewystarczające pozwolenie" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "Nieprawidłowa wiadomość" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "Nieprawidłowy adres." -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "Poza Twoją domeną." -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "Posiada już konto." -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Niektórych emaili nie udało się potwierdzić, więc nie wysłano żadnych zaproszeń." -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "Nie mogliśmy nikogo zaprosić." -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1829,7 +1864,7 @@ msgstr "Emoji '%s' nie istnieje" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "Nieprawidłowe znaki w nazwie emoji" @@ -1841,59 +1876,59 @@ msgstr "Ten string zaczyna się wielką literą" msgid "Could not allocate event queue" msgstr "Nie można stworzyć kolejki zdarzeń" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1902,12 +1937,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "Operator %s nie jest wspierany." -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "Token nie istnieje" @@ -1976,7 +2015,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "Nieprawidłowe znaki w nazwie!" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "Niewłaściwa nazwa lub nazwa użytkownika" @@ -2048,56 +2087,56 @@ msgstr "%s nie jest dozwolonym typem (allowed_type)" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (%(value)s jest błędna)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "Wewnętrzny błąd serwera" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "Brak argumentu 'queue_id'" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "Brak argumentu 'last_event_id'" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "Nie masz uprawnień do wydarzeń z tej kolejki" @@ -2106,15 +2145,19 @@ msgstr "Nie masz uprawnień do wydarzeń z tej kolejki" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2155,43 +2198,43 @@ msgstr "Niewłaściwa subdomena" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "Środowisko deweloperskie jest wyłączone." -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "Twoja domena została dezaktywowana." -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "Twoje konto zostało wyłączone." -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "Uwierzytelnianie hasłem jest wyłączone w twoim zespole." -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "Ten użytkownik nie jest zarejestrowany; zarejestruj przez przeglądarkę." -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "Twoja nazwa użytkownika lub hasło są nieprawidłowe." -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID nie jest skonfigurowany" @@ -2239,49 +2282,49 @@ msgstr "Kanał nie istnieje: %s. Nie wysłano zaproszeń." msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "Nie ma wątku '%s'" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "Nieznana organizacja %s" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "Brak nadawcy" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "nieprawdłowa wiadomość-mirror" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "Nieprawidłowa domena-mirror" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "Nazwy kanałów IRC muszą zaczynać się krzyżykiem (#)" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "Nie masz pozwolenia na edycję tej wiadomości" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "Czas na edycję tej wiadomości upłynął" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "Nie ma czego zmienić" @@ -2326,11 +2369,11 @@ msgstr "Pusty lub nieprawidłowy token długości" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "Ta reakcja już istnieje" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "Reakcja nie istnieje" @@ -2383,11 +2426,11 @@ msgstr "Nie znaleziono filtru" msgid "You must upload exactly one icon." msgstr "Prześlij dokładnie jedną ikonę." -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "Wyłączono tworzenie nowych organizacji." -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "Link tworzenia organizacji jest przeterminowany lub nieprawidłowy." @@ -2432,10 +2475,6 @@ msgstr "Nieznana własność subskrypcji: %s" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "Niewłaściwwe dane przekazane do tutorial_send_message" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2507,12 +2546,12 @@ msgstr "Nie można usunąć jedynego administratora organizacji" msgid "Username already in use" msgstr "Nazwa użytkownika już jest używana" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "Email '%s' już jest używany" @@ -2601,10 +2640,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "Nieznana akcja WordPress webhook:" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/pl/translations.json b/static/locale/pl/translations.json index 408286dbcc..76c001e882 100644 --- a/static/locale/pl/translations.json +++ b/static/locale/pl/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "Plik o nazwie \"__file_name__\" przekroczył dozwolony rozmiar 25MB.", + "(This user has been deactivated)": "", "(no topic)": "(brak wątku)", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "Ustawienia filtrów", "Filter streams": "Filtruj kanały", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "Nie pamiętasz?", "Formatting": "Formatowanie", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "Brak", "Note that any bots that you maintain will be disabled.": "Uwaga: używane boty zostaną wyłączone.", - "Nothing selected.": "Nic nie wybrano.", "Nothing to preview": "Brak treści do podglądu", "Notifications": "Powiadomienia", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", @@ -509,4 +510,4 @@ "more topics": "więcej wątków", "right": "prawa", "text": "" -} +} \ No newline at end of file diff --git a/static/locale/pt/LC_MESSAGES/django.po b/static/locale/pt/LC_MESSAGES/django.po index 965cdaf503..3e1d4fb231 100644 --- a/static/locale/pt/LC_MESSAGES/django.po +++ b/static/locale/pt/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Portuguese (http://www.transifex.com/zulip/zulip/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,17 +18,17 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "" @@ -192,7 +192,7 @@ msgstr "" #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Fechar" @@ -390,11 +390,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Administradores" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "" @@ -460,15 +460,15 @@ msgid "Login" msgstr "" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Registrar" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -480,7 +480,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Integrações" @@ -496,11 +496,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "" @@ -740,7 +740,7 @@ msgstr "" msgid "Invite" msgstr "" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Atalhos de teclado" @@ -1032,19 +1032,19 @@ msgstr "Entre com o Google" msgid "Sign in with GitHub" msgstr "Entre com o GitHub" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1052,7 +1052,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1065,81 +1065,111 @@ msgstr "" msgid "Message edit history" msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "Buscar" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "Gerenciar fluxos" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "Configurações" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "Operadores de busca" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "Aplicativos móveis e para desktop" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "Documentação da API" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "Convidar usuários" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "Sair" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "Depurar" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1149,14 +1179,14 @@ msgstr "Zulip" msgid "Log in" msgstr "Entrar" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1206,14 +1236,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1364,13 +1394,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1470,14 +1510,14 @@ msgstr "" msgid "Save" msgstr "" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1534,60 +1574,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1607,167 +1642,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1828,7 +1863,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1840,59 +1875,59 @@ msgstr "" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1901,12 +1936,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1975,7 +2014,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2047,56 +2086,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2105,15 +2144,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2154,43 +2197,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2238,49 +2281,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2325,11 +2368,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2382,11 +2425,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2431,10 +2474,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2506,12 +2545,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2600,10 +2639,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/pt/translations.json b/static/locale/pt/translations.json index 2fc9ec5052..9f17ec1665 100644 --- a/static/locale/pt/translations.json +++ b/static/locale/pt/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "", "Formatting": "Formata\u00e7\u00e3o", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", diff --git a/static/locale/ru/LC_MESSAGES/django.po b/static/locale/ru/LC_MESSAGES/django.po index 28007bb87f..4b8f142a11 100644 --- a/static/locale/ru/LC_MESSAGES/django.po +++ b/static/locale/ru/LC_MESSAGES/django.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 09:15+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Russian (http://www.transifex.com/zulip/zulip/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,17 +21,17 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "Неизвестное название графика: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "" @@ -195,7 +195,7 @@ msgstr "На всякий случай, проверьте вашу папку \ #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Закрыть" @@ -393,11 +393,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Администраторы" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Обычные пользователи" @@ -463,15 +463,15 @@ msgid "Login" msgstr "" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Зарегистрироваться" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "Условия использования" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -483,7 +483,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Интеграции" @@ -499,11 +499,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "Войдите сейчас!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "Зарегистрируйтесь сейчас!" @@ -743,7 +743,7 @@ msgstr "" msgid "Invite" msgstr "Пригласить" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Горячие клавиши" @@ -1035,19 +1035,19 @@ msgstr "Войти через Google" msgid "Sign in with GitHub" msgstr "Войти через GitHub" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Форматирование сообщений" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Вы пишете" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "Получается" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1055,7 +1055,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1068,81 +1068,111 @@ msgstr "" msgid "Message edit history" msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "Поиск" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "Помощь по поиску" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "Настройки" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "Приложения для компьютера и смартфонов" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "документация API" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "Обратная связь" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "Пригласить пользователей" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "Связь с Webathena" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "Выйти" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "Отладка" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1152,14 +1182,14 @@ msgstr "Zulip" msgid "Log in" msgstr "Войти" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1209,14 +1239,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "Поддомен" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "Адрес, через который вы будете заходить в организацию." -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1367,13 +1397,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1473,14 +1513,14 @@ msgstr "Очистить аватар" msgid "Save" msgstr "Сохранить" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1537,60 +1577,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "Вы должны быть администратором организации" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "Неверный API-ключ" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "Учетная запись отключена" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "Организация для этой учетной записи отключена" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "Учетная запись не связана с этим поддоменом" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "Неверный API-ключ" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "Неверный заголовок для Basic-авторизации" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "Требуется авторизация" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "Webohooks доступны только для webhook-ботов" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "Доступ запрещен" @@ -1610,167 +1645,167 @@ msgstr "Название поддомена должно содержать то msgid "Subdomain unavailable. Please choose a different one." msgstr "Поддомен недоступен. Пожалуйста, выберите другой." -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "Пожалуйста, используйте реальный адрес email." -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "Невозможно отобразить сообщение" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "Пропущен параметр: 'to' (получатель)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "Неправильное значение 'op' (должно быть 'start' или 'stop')" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "Пользователь не авторизован для такого запроса" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "'%s' больше не использует Zulip." -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "Вы не можете отправлять личные сообщения за пределы своей организации." -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "Сообщение не должно быть пустым" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "Не заполнена тема" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "Тема не может быть пустой" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "Канал '%(stream_name)s' не существует" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "Пользователь не авторизован для отправки сообщений в канал '%s'" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "У сообщения должны быть получатели" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "Неверный тип сообщения" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "У вас нет прав для просмотра участников открытых каналов в этой организации" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "Не удалось получить участников закрытого канала" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "Недостаточно прав" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "Неверное сообщение(я)" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "Неверный адрес" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "Не принадлежит вашему домену." -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "Уже имеет учетную запись." -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Некоторые адреса email не прошли проверку, поэтому мы не выслали ни одного приглашения." -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "Мы не смогли никого пригласить." -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1831,7 +1866,7 @@ msgstr "Эмодзи '%s' не существует" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1843,59 +1878,59 @@ msgstr "Неверный параметр type" msgid "Could not allocate event queue" msgstr "Не удается выделить очередь событий" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1904,12 +1939,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "Оператор %s не поддерживается." -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "Токен не существует" @@ -1978,7 +2017,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "Неверное имя или имя пользователя" @@ -2050,56 +2089,56 @@ msgstr "типа переменной %s нет среди разрешенны msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (неверное значение %(value)s)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "Внутренняя ошибка сервера" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "Пропущен параметр 'queue_id'" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "Пропущен параметр 'last_event_id'" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "Вы не авторизованы для получения событий из этой очереди" @@ -2108,15 +2147,19 @@ msgstr "Вы не авторизованы для получения событ msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2157,43 +2200,43 @@ msgstr "Неправильный поддомен" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "Окружение для разработки отключено." -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "Ваша организация выключена" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "Ваш аккаунт был отключен." -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "Авторизация по паролю отключена в вашей команде." -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "Пользователь незарегистрирован; попробуйте через браузер." -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "Неправильное имя пользователя или пароль." -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "Не указан GOOGLE_CLIENT_ID." @@ -2241,49 +2284,49 @@ msgstr "Канал не существует: %s. Приглашения не б msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "Нет такой темы '%s'" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "Не указан отправитель" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "Неправильная организация для зеркалирования" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "Названия IRC-каналов должны начинаться с #" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "У вас нет прав для редактирования этого сообщения" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "Период для редактирования этого сообщения истек" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "Ничего не изменилось" @@ -2328,11 +2371,11 @@ msgstr "Пустой или неверный токен длины" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "Реакция уже существует" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "Реакция не существует" @@ -2385,11 +2428,11 @@ msgstr "Фильтр не найден" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "Создание новых организаций отключено." -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2434,10 +2477,6 @@ msgstr "Неизвестное свойство подписки: %s" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "Неверные данные переданы в tutorial_send_message" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2509,12 +2548,12 @@ msgstr "Невозможно удалить единственного адми msgid "Username already in use" msgstr "Имя пользователя занято" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "Адрес email '%s' уже используется" @@ -2603,10 +2642,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/ru/translations.json b/static/locale/ru/translations.json index 2df8896944..c49b86c23e 100644 --- a/static/locale/ru/translations.json +++ b/static/locale/ru/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "(без темы)", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "Отфильтровать каналы", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "Забыли?", "Formatting": "Форматирование текста", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "Пусто", "Note that any bots that you maintain will be disabled.": "Обратите внимание, все ваши боты будут отключены.", - "Nothing selected.": "Ничего не выбрано.", "Nothing to preview": "Пустое сообщение", "Notifications": "Оповещения", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", @@ -509,4 +510,4 @@ "more topics": "еще темы", "right": "правой", "text": "" -} +} \ No newline at end of file diff --git a/static/locale/sr/LC_MESSAGES/django.po b/static/locale/sr/LC_MESSAGES/django.po index 8bf5d27d86..35cbbf0072 100644 --- a/static/locale/sr/LC_MESSAGES/django.po +++ b/static/locale/sr/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Serbian (http://www.transifex.com/zulip/zulip/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,17 +18,17 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" msgstr "" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "" @@ -192,7 +192,7 @@ msgstr "" #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "Затвори" @@ -390,11 +390,11 @@ msgstr "" msgid "(Or visit the normal login page)" msgstr "" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "Админстратори" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "Обични корисници" @@ -460,15 +460,15 @@ msgid "Login" msgstr "" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "Региструј се" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "Услови коришћења" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" msgstr "" @@ -480,7 +480,7 @@ msgstr "" msgid "Desktop & mobile apps" msgstr "" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "Интеграције" @@ -496,11 +496,11 @@ msgstr "" msgid "The best chat for working groups and communities" msgstr "" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "Пријавите се сада!" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "Упишите се одмах!" @@ -740,7 +740,7 @@ msgstr "" msgid "Invite" msgstr "Позови" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "Пречице на тастатури" @@ -1032,19 +1032,19 @@ msgstr "Пријавите се уз Гугл" msgid "Sign in with GitHub" msgstr "" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "Форматирање поруке" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "Укуцате" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "А добијете" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" @@ -1052,7 +1052,7 @@ msgid "" " You can also make a code block by indenting each line with 4 spaces." msgstr "" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" @@ -1065,81 +1065,111 @@ msgstr "" msgid "Message edit history" msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." +msgstr "" + +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "Претрага" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" msgstr "" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "Потражите помоћ" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" msgstr "" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" msgstr "" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "Подешавања" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" msgstr "" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" msgstr "" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "Стони и мобилни програми" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" msgstr "АПИ документација" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" msgstr "" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "Повратни подаци" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" msgstr "" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "Увежите преко Webathena услуге" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "Одјави ме" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "Поправљање грешака" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "" @@ -1149,14 +1179,14 @@ msgstr "" msgid "Log in" msgstr "Пријави се" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1206,14 +1236,14 @@ msgid "Shorter is better than longer." msgstr "" #: templates/zerver/register.html:101 -msgid "Subdomain" +msgid "Organization URL" msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" @@ -1364,13 +1394,23 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" @@ -1470,14 +1510,14 @@ msgstr "" msgid "Save" msgstr "" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1534,60 +1574,55 @@ msgid "" " " msgstr "" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" +#: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" msgstr "" -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 +#: zerver/decorator.py:212 msgid "This API is not available to incoming webhook bots." msgstr "" -#: zerver/decorator.py:203 +#: zerver/decorator.py:223 msgid "Account not active" msgstr "" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" msgstr "" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." msgstr "" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." msgstr "" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "" @@ -1607,167 +1642,167 @@ msgstr "" msgid "Subdomain unavailable. Please choose a different one." msgstr "" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." msgstr "" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." msgstr "" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." msgstr "" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." msgstr "" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." msgstr "" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" msgstr "" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" msgstr "" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." msgstr "" -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" msgstr "" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" msgstr "" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" msgstr "" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" msgstr "" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." msgstr "" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" msgstr "" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" msgstr "" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1828,7 +1863,7 @@ msgstr "" msgid "Must be a realm administrator or emoji author" msgstr "" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" msgstr "" @@ -1840,59 +1875,59 @@ msgstr "" msgid "Could not allocate event queue" msgstr "" -#: zerver/lib/integrations.py:36 +#: zerver/lib/integrations.py:37 msgid "Integration frameworks" msgstr "" -#: zerver/lib/integrations.py:37 +#: zerver/lib/integrations.py:38 msgid "Continuous integration" msgstr "" -#: zerver/lib/integrations.py:38 +#: zerver/lib/integrations.py:39 msgid "Customer support" msgstr "" -#: zerver/lib/integrations.py:39 +#: zerver/lib/integrations.py:40 msgid "Deployment" msgstr "" -#: zerver/lib/integrations.py:40 +#: zerver/lib/integrations.py:41 msgid "Communication" msgstr "" -#: zerver/lib/integrations.py:41 +#: zerver/lib/integrations.py:42 msgid "Financial" msgstr "" -#: zerver/lib/integrations.py:42 +#: zerver/lib/integrations.py:43 msgid "HR" msgstr "" -#: zerver/lib/integrations.py:43 +#: zerver/lib/integrations.py:44 msgid "Marketing" msgstr "" -#: zerver/lib/integrations.py:44 +#: zerver/lib/integrations.py:45 msgid "Miscellaneous" msgstr "" -#: zerver/lib/integrations.py:45 +#: zerver/lib/integrations.py:46 msgid "Monitoring tools" msgstr "" -#: zerver/lib/integrations.py:46 +#: zerver/lib/integrations.py:47 msgid "Project management" msgstr "" -#: zerver/lib/integrations.py:47 +#: zerver/lib/integrations.py:48 msgid "Productivity" msgstr "" -#: zerver/lib/integrations.py:48 +#: zerver/lib/integrations.py:49 msgid "Version control" msgstr "" -#: zerver/lib/integrations.py:49 +#: zerver/lib/integrations.py:50 msgid "Interactive bots" msgstr "" @@ -1901,12 +1936,16 @@ msgstr "" msgid "Operator %s not supported." msgstr "" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "" @@ -1975,7 +2014,7 @@ msgstr "" msgid "Invalid characters in name!" msgstr "" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "" @@ -2047,56 +2086,56 @@ msgstr "" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" msgstr "" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" msgstr "" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" msgstr "" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" msgstr "" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" msgstr "" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" msgstr "" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "" @@ -2105,15 +2144,19 @@ msgstr "" msgid "Bad event queue id: {queue_id}" msgstr "" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" +msgstr "" + +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" msgstr "" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" msgstr "" @@ -2154,43 +2197,43 @@ msgstr "" msgid "Invalid OTP" msgstr "" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -2238,49 +2281,49 @@ msgstr "" msgid "Invalid narrow operator: {desc}" msgstr "" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" msgstr "" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" msgstr "" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" msgstr "" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" msgstr "" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "" @@ -2325,11 +2368,11 @@ msgstr "" msgid "Invalid APNS token" msgstr "" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" msgstr "" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" msgstr "" @@ -2382,11 +2425,11 @@ msgstr "" msgid "You must upload exactly one icon." msgstr "" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." msgstr "" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." msgstr "" @@ -2431,10 +2474,6 @@ msgstr "" msgid "Not subscribed to stream id %d" msgstr "" -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "" - #: zerver/views/upload.py:42 msgid "

File not found.

" msgstr "" @@ -2506,12 +2545,12 @@ msgstr "" msgid "Username already in use" msgstr "" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" msgstr "" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "" @@ -2600,10 +2639,10 @@ msgstr "" msgid "Unknown WordPress webhook action: " msgstr "" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" msgstr "" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" msgstr "" diff --git a/static/locale/sr/translations.json b/static/locale/sr/translations.json index 9e51a298a7..9a1562c73c 100644 --- a/static/locale/sr/translations.json +++ b/static/locale/sr/translations.json @@ -1,5 +1,6 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "(This user has been deactivated)": "", "(no topic)": "", "24-hour time (17:00 instead of 5:00 PM)": "", "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", @@ -189,6 +190,7 @@ "Filter settings": "", "Filter streams": "", "Filter users": "", + "First time? Read our guidelines for creating and naming streams.": "", "For more information on public/private streams, check out our docs.": "", "Forgotten it?": "", "Formatting": "", @@ -292,7 +294,6 @@ "No users match your current filter.": "", "None": "", "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", "Nothing to preview": "", "Notifications": "", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", diff --git a/static/locale/zh_Hans/LC_MESSAGES/django.po b/static/locale/zh_Hans/LC_MESSAGES/django.po index 3ffbf5d7b3..2cc1d6e154 100644 --- a/static/locale/zh_Hans/LC_MESSAGES/django.po +++ b/static/locale/zh_Hans/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Chriser Chaoo , 2017 # Huiming Tao , 2017 # 张建春 , 2016 # 张建春 , 2016 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 06:37+0000\n" -"PO-Revision-Date: 2017-10-05 06:45+0000\n" -"Last-Translator: Umair Waheed Khan \n" +"POT-Creation-Date: 2017-10-20 17:20+0000\n" +"PO-Revision-Date: 2017-10-20 17:24+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Chinese Simplified (http://www.transifex.com/zulip/zulip/language/zh-Hans/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,32 +21,32 @@ msgstr "" "Language: zh-Hans\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: analytics/views.py:82 +#: analytics/views.py:83 #, python-format msgid "Unknown chart name: %s" msgstr "未知图表名称: %s" -#: analytics/views.py:87 +#: analytics/views.py:92 #, python-format msgid "Start time is later than end time. Start: %(start)s, End: %(end)s" -msgstr "开始时间晚于结束时间。开始时间: %(start)s, 结束时间: %(end)s" +msgstr "开始时间不应晚于结束时间。开始时间: %(start)s, 结束时间: %(end)s" -#: analytics/views.py:100 +#: analytics/views.py:105 msgid "No analytics data available. Please contact your server administrator." msgstr "没有分析数据可用。 请联系您的服务器管理员。" #: templates/analytics/stats.html:17 #, python-format msgid "Zulip analytics for %(realm_name)s" -msgstr "" +msgstr "Zulip分析：%(realm_name)s" #: templates/analytics/stats.html:21 msgid "Messages sent over time" -msgstr "" +msgstr "信息发送时间" #: templates/analytics/stats.html:23 msgid "Aggregation" -msgstr "" +msgstr "集成模块" #: templates/analytics/stats.html:25 msgid "Daily" @@ -57,7 +58,7 @@ msgstr "每周" #: templates/analytics/stats.html:27 msgid "Cumulative" -msgstr "" +msgstr "积累" #: templates/analytics/stats.html:33 templates/analytics/stats.html:47 #: templates/analytics/stats.html:65 @@ -116,15 +117,15 @@ msgstr "最近更新" msgid "" "A full update of all the graphs happens once a day.
The “Messages Sent " "Over Time” graph is updated once an hour." -msgstr "" +msgstr "总图表每天更新一次。
时间轴上的消息图表每小时更新。" #: templates/analytics/stats.html:93 msgid "Analytics documentation" -msgstr "" +msgstr "分析统计" #: templates/confirmation/confirm_email_change.html:8 msgid "Email changed!" -msgstr "" +msgstr "电子邮件已修改！" #: templates/zerver/about.html:211 msgid "Avatar" @@ -148,7 +149,7 @@ msgstr "邮箱" #: templates/zerver/accounts_accept_terms.html:41 #, python-format msgid "I agree to the Terms of Service." -msgstr "" +msgstr "我同意服务条款。" #: templates/zerver/accounts_accept_terms.html:53 msgid "Enter" @@ -160,7 +161,7 @@ msgstr "注册Zulip" #: templates/zerver/accounts_home.html:35 msgid "You need an invitation to join this organization." -msgstr "您需要邀请才能加入本组织。" +msgstr "您需要邀请才能加入本社群。" #: templates/zerver/accounts_home.html:65 msgid "Sign up" @@ -194,7 +195,7 @@ msgstr "也有可能在您的垃圾邮件夹中" #: templates/zerver/invite_user.html:5 #: templates/zerver/lightbox_overlay.html:7 #: templates/zerver/message_history.html:4 -#: templates/zerver/message_history.html:12 +#: templates/zerver/message_history.html:12 templates/zerver/navbar.html:3 msgid "Close" msgstr "关闭" @@ -224,7 +225,7 @@ msgid "" "The organization you are trying to join, %(closed_domain_name)s, only allows" " users with e-mail addresses within the organization. Please ask for a new " "invite to an appropriate e-mail address." -msgstr "您要加入的社区，%(closed_domain_name)s， 仅限同域名的邮箱用户加入；请使用正确的邮箱申请。" +msgstr "您要加入的社群，%(closed_domain_name)s， 仅限同域名的邮箱用户加入；请使用正确的邮箱申请。" #: templates/zerver/compose.html:8 templates/zerver/compose.html:10 #: templates/zerver/compose.html:98 @@ -313,7 +314,7 @@ msgid "" " organization first. Please use EmailAuthBackend to create\n" " your organization and then try again.\n" " " -msgstr "" +msgstr "\n您正在试图使用LDAP登录且不创建阻止，请使用电子邮件认证登录然后再试一次。" #: templates/zerver/confirm_continue_registration.html:10 msgid "Zulip account not found." @@ -324,7 +325,7 @@ msgid "" "\n" " Please click the following button if you wish to register.\n" " " -msgstr "" +msgstr "\n如欲注册，请按以下按钮。" #: templates/zerver/confirm_continue_registration.html:24 #, python-format @@ -334,15 +335,15 @@ msgid "" " No account found for %(email)s. Would you like to register instead?\n" "\n" " " -msgstr "" +msgstr "\n\n没有找到用户：%(email)s。你真的注册了吗？\n\n\n " #: templates/zerver/confirm_continue_registration.html:38 msgid "Go back to login" -msgstr "" +msgstr "返回登录" #: templates/zerver/confirm_continue_registration.html:52 msgid "Register instead" -msgstr "" +msgstr "注册替换" #: templates/zerver/create_realm.html:18 msgid "Create a new Zulip organization" @@ -358,7 +359,7 @@ msgstr "创建社区" #: templates/zerver/deactivated.html:9 msgid "Deactivated organization" -msgstr "关闭的社区" +msgstr "关闭的社群" #: templates/zerver/deactivated.html:14 #, python-format @@ -368,7 +369,7 @@ msgid "" " Please contact %(support_email)s to reactivate\n" " this group.\n" " " -msgstr "" +msgstr "\n您要加入的社群%(deactivated_domain_name)s，已被关闭。如需要重新开放团队，请联系%(support_email)s\n " #: templates/zerver/delete_message.html:4 msgid "Delete message" @@ -390,19 +391,19 @@ msgstr "是的，删除这条消息" #: templates/zerver/dev_login.html:12 msgid "(Or visit the normal login page)" -msgstr "" +msgstr "（或访问登陆页面）" -#: templates/zerver/dev_login.html:19 +#: templates/zerver/dev_login.html:17 msgid "Administrators" msgstr "管理员" -#: templates/zerver/dev_login.html:30 +#: templates/zerver/dev_login.html:29 msgid "Normal users" msgstr "普通用户" #: templates/zerver/find_account.html:8 msgid "Find your Zulip accounts" -msgstr "" +msgstr "查找你的Zulip账户" #: templates/zerver/find_account.html:41 msgid "Email addresses" @@ -410,11 +411,11 @@ msgstr "邮箱地址" #: templates/zerver/find_account.html:43 msgid "Find accounts" -msgstr "" +msgstr "查找账户" #: templates/zerver/footer.html:3 msgid "About Zulip" -msgstr "" +msgstr "关于Zulip" #: templates/zerver/footer.html:5 templates/zerver/left_sidebar.html:5 #: templates/zerver/left_sidebar.html:10 @@ -423,7 +424,7 @@ msgstr "主页" #: templates/zerver/footer.html:6 msgid "Why Zulip" -msgstr "" +msgstr "为什么选择Zulip" #: templates/zerver/footer.html:7 msgid "Features" @@ -431,7 +432,7 @@ msgstr "功能" #: templates/zerver/footer.html:8 msgid "Plans & pricing" -msgstr "" +msgstr "计划 & 价格" #: templates/zerver/footer.html:11 msgid "About" @@ -439,100 +440,100 @@ msgstr "关于Zulip" #: templates/zerver/footer.html:16 msgid "Help & community" -msgstr "" +msgstr "帮助 & 社区" #: templates/zerver/footer.html:18 msgid "Help center" -msgstr "" +msgstr "帮助中心" #: templates/zerver/footer.html:25 msgid "Accounts" -msgstr "" +msgstr "账户" #: templates/zerver/footer.html:29 msgid "Find account" -msgstr "" +msgstr "查找账户" #: templates/zerver/footer.html:32 msgid "New organization" -msgstr "" +msgstr "新社区" #: templates/zerver/footer.html:36 msgid "Login" msgstr "登录" #: templates/zerver/footer.html:41 templates/zerver/portico-header.html:34 -#: templates/zerver/register.html:151 +#: templates/zerver/register.html:163 msgid "Register" msgstr "注册" -#: templates/zerver/footer.html:43 +#: templates/zerver/footer.html:43 templates/zerver/terms.html:21 msgid "Terms of Service" msgstr "服务条款" -#: templates/zerver/footer.html:44 +#: templates/zerver/footer.html:44 templates/zerver/privacy.html:23 msgid "Privacy policy" -msgstr "" +msgstr "隐私策略" #: templates/zerver/footer.html:48 msgid "Apps & integrations" -msgstr "" +msgstr "App & 集成" #: templates/zerver/footer.html:50 msgid "Desktop & mobile apps" -msgstr "" +msgstr "桌面版 & 手机版 应用" -#: templates/zerver/footer.html:51 templates/zerver/navbar.html:97 +#: templates/zerver/footer.html:51 templates/zerver/navbar.html:119 msgid "Integrations" msgstr "应用整合" #: templates/zerver/for-companies.html:23 msgid "The best chat for workplaces" -msgstr "" +msgstr "最佳工作聊天场所" #: templates/zerver/for-open-source.html:23 msgid "The best chat for open source projects" -msgstr "" +msgstr "最棒的开源聊天项目" #: templates/zerver/for-working-groups-and-communities.html:23 msgid "The best chat for working groups and communities" -msgstr "" +msgstr "最好的工作组或社区交谈" -#: templates/zerver/hello.html:43 templates/zerver/hello.html:608 +#: templates/zerver/hello.html:43 templates/zerver/hello.html:609 msgid "Log in now!" msgstr "现在登录！" -#: templates/zerver/hello.html:48 templates/zerver/hello.html:613 +#: templates/zerver/hello.html:48 templates/zerver/hello.html:614 msgid "Register now!" msgstr "立即注册！" #: templates/zerver/hello.html:517 msgid "Travis logo" -msgstr "" +msgstr "Travis logo" #: templates/zerver/hello.html:524 msgid "Github logo" -msgstr "" +msgstr "Github logo" #: templates/zerver/hello.html:531 msgid "Heroku logo" -msgstr "" +msgstr "Heroku logo" #: templates/zerver/hello.html:538 msgid "Zendesk logo" -msgstr "" +msgstr "Zendesk logo" #: templates/zerver/hello.html:545 msgid "JIRA logo" -msgstr "" +msgstr "JIRA logo" #: templates/zerver/hello.html:552 msgid "Sentry logo" -msgstr "" +msgstr "Sentry logo" #: templates/zerver/hello.html:559 msgid "Pagerduty logo" -msgstr "" +msgstr "Pagerduty logo" #: templates/zerver/home.html:14 msgid "Welcome to Zulip." @@ -549,7 +550,7 @@ msgid "" " and \n" " compose a new stream message.

\n" " " -msgstr "" +msgstr "\n

看，关于这些事。。。没有任何消息\n现在交给你，我相信总会有人发送给你\n发一次

\n\n

或者自己把握一下\n和\n撰写一个新的频道消息。" #: templates/zerver/home.html:26 msgid "Nothing's been sent here yet!" @@ -582,7 +583,7 @@ msgstr "您没有和该用户的私信" #: templates/zerver/home.html:50 msgid "You have no group private messages with this person yet!" -msgstr "" +msgstr "你没有和这个群组的任何消息" #: templates/zerver/home.html:58 msgid "You have no private messages with these people yet!" @@ -607,7 +608,7 @@ msgstr "订阅" #: templates/zerver/home.html:80 msgid "You are not subscribed to this stream." -msgstr "" +msgstr "你没有订阅这个频道" #: templates/zerver/home.html:83 msgid "You haven't starred anything yet!" @@ -620,15 +621,15 @@ msgid "" "

Learn more about starring messages at \n" " %(realm_uri)s/help/star-a-message.

\n" " " -msgstr "" +msgstr "\n

欲知更多关于星标信息，请访问\n%(realm_uri)s/help/star-a-message。

" #: templates/zerver/home.html:91 msgid "You have no unread messages!" -msgstr "" +msgstr "你还没有没有未读消息" #: templates/zerver/home.html:94 msgid "You haven't been mentioned yet!" -msgstr "" +msgstr "你没有被提到" #: templates/zerver/home.html:96 #, python-format @@ -637,7 +638,7 @@ msgid "" "

Learn more about mentions at \n" " %(realm_uri)s/help/at-mention-a-team-member.

\n" " " -msgstr "" +msgstr "\n

欲知更多关于@信息，请访问\n%(realm_uri)s/help/at-mention-a-team-member。

" #: templates/zerver/home.html:102 msgid "Nobody has talked about that yet!" @@ -657,7 +658,7 @@ msgstr "如果消息没有发送，请等待几秒钟后再Unable to connect to\n" " Zulip. Updates may be delayed." -msgstr "" +msgstr "无法连接到\n Zulip更新可能会推迟。" #: templates/zerver/index.html:71 msgid "Retrying soon..." @@ -669,7 +670,7 @@ msgstr "立即连接" #: templates/zerver/integrations/index.html:28 msgid "Over 60 native integrations." -msgstr "" +msgstr "超过60个本地的集成" #: templates/zerver/integrations/index.html:32 msgid "" @@ -680,15 +681,15 @@ msgid "" " and\n" " IFTTT.\n" " " -msgstr "" +msgstr "\n和数以百计的通过\n Hubot,\n Zapier,\n and\n IFTTT." #: templates/zerver/integrations/index.html:46 msgid "Search integrations" -msgstr "" +msgstr "搜索模块" #: templates/zerver/integrations/index.html:53 msgid "Filter by category" -msgstr "" +msgstr "按照类型过滤" #: templates/zerver/integrations/index.html:72 msgid "Categories" @@ -700,7 +701,7 @@ msgstr "所有" #: templates/zerver/integrations/index.html:116 msgid "Create your own!" -msgstr "" +msgstr "创建属于你自己的！" #: templates/zerver/invalid_realm.html:7 msgid "Organization does not exist" @@ -708,7 +709,7 @@ msgstr "组织不存在" #: templates/zerver/invalid_realm.html:13 msgid "There is no Zulip organization hosted at this subdomain." -msgstr "" +msgstr "该子域名中没有部署Zulip社区服务" #: templates/zerver/invite_user.html:6 msgid "Invite users to Zulip" @@ -742,7 +743,7 @@ msgstr "邀请中..." msgid "Invite" msgstr "邀请" -#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:76 +#: templates/zerver/keyboard_shortcuts.html:2 templates/zerver/navbar.html:98 msgid "Keyboard shortcuts" msgstr "快捷键" @@ -806,7 +807,7 @@ msgstr "写消息" #: templates/zerver/keyboard_shortcuts.html:73 msgid "Compose a reply @-mentioning author" -msgstr "" +msgstr "撰写回复@-mentioning的作者" #: templates/zerver/keyboard_shortcuts.html:77 msgid "Send message" @@ -846,7 +847,7 @@ msgstr "返回主页" #: templates/zerver/keyboard_shortcuts.html:125 msgid "Message actions" -msgstr "" +msgstr "消息动作" #: templates/zerver/keyboard_shortcuts.html:130 msgid "Edit your last message" @@ -858,39 +859,39 @@ msgstr "显示消息发送人详情" #: templates/zerver/keyboard_shortcuts.html:138 msgid "Show images in thread" -msgstr "" +msgstr "在线程中显示图像" #: templates/zerver/keyboard_shortcuts.html:142 msgid "Edit selected message" -msgstr "" +msgstr "编辑选中的消息" #: templates/zerver/keyboard_shortcuts.html:146 msgid "Star selected message" -msgstr "" +msgstr "星标选中的信息" #: templates/zerver/keyboard_shortcuts.html:151 msgid "React to selected message with" -msgstr "" +msgstr "用选择的邮件反馈" #: templates/zerver/keyboard_shortcuts.html:160 msgid "Collapse/show selected message" -msgstr "" +msgstr "折叠/显示所选消息" #: templates/zerver/keyboard_shortcuts.html:164 msgid "Toggle topic mute" -msgstr "" +msgstr "切换主题静音" #: templates/zerver/keyboard_shortcuts.html:178 msgid "View drafts" -msgstr "" +msgstr "查看草稿" #: templates/zerver/keyboard_shortcuts.html:182 msgid "Edit selected draft" -msgstr "" +msgstr "编辑选中的草稿" #: templates/zerver/keyboard_shortcuts.html:186 msgid "Delete selected draft" -msgstr "" +msgstr "删除选定的草稿" #: templates/zerver/keyboard_shortcuts.html:192 msgid "Menus" @@ -898,39 +899,39 @@ msgstr "菜单" #: templates/zerver/keyboard_shortcuts.html:197 msgid "Toggle the gear menu" -msgstr "" +msgstr "切换齿轮菜单" #: templates/zerver/keyboard_shortcuts.html:201 msgid "Open message menu" -msgstr "" +msgstr "打开消息菜单" #: templates/zerver/keyboard_shortcuts.html:205 msgid "Open reactions menu" -msgstr "" +msgstr "打开反对菜单" #: templates/zerver/keyboard_shortcuts.html:209 msgid "Show keyboard shortcuts" -msgstr "" +msgstr "显示键盘快捷键" #: templates/zerver/keyboard_shortcuts.html:218 msgid "Streams settings" -msgstr "" +msgstr "频道设置" #: templates/zerver/keyboard_shortcuts.html:223 msgid "Scroll through streams" -msgstr "" +msgstr "滚动频道" #: templates/zerver/keyboard_shortcuts.html:227 msgid "Switch between tabs" -msgstr "" +msgstr "切换选项卡" #: templates/zerver/keyboard_shortcuts.html:231 msgid "View stream messages" -msgstr "" +msgstr "显示频道消息" #: templates/zerver/keyboard_shortcuts.html:235 msgid "Subscribe to/unsubscribe from selected stream" -msgstr "" +msgstr "订阅/取消订阅所选频道" #: templates/zerver/keyboard_shortcuts.html:239 msgid "Create new stream" @@ -938,7 +939,7 @@ msgstr "创建新频道" #: templates/zerver/keyboard_shortcuts.html:244 msgid "Detailed keyboard shortcuts documentation" -msgstr "" +msgstr "详细的键盘快捷键文档" #: templates/zerver/left_sidebar.html:16 templates/zerver/left_sidebar.html:21 msgid "Private messages" @@ -954,7 +955,7 @@ msgstr "被提及" #: templates/zerver/left_sidebar.html:48 msgid "Subscribed streams" -msgstr "" +msgstr "订阅频道" #: templates/zerver/left_sidebar.html:48 msgid "STREAMS" @@ -962,15 +963,15 @@ msgstr "频道" #: templates/zerver/left_sidebar.html:49 msgid "Subscribe, add, or configure streams" -msgstr "" +msgstr "订阅，添加或配置频道" #: templates/zerver/left_sidebar.html:50 msgid "Filter streams" -msgstr "" +msgstr "过滤频道" #: templates/zerver/left_sidebar.html:51 msgid "Join stream" -msgstr "" +msgstr "加入频道" #: templates/zerver/left_sidebar.html:54 msgid "All streams" @@ -978,15 +979,15 @@ msgstr "所有频道" #: templates/zerver/lightbox_overlay.html:10 msgid "Pan & Zoom" -msgstr "" +msgstr "缩小 & 放大" #: templates/zerver/lightbox_overlay.html:11 msgid "Disabled" -msgstr "" +msgstr "禁用" #: templates/zerver/lightbox_overlay.html:11 msgid "Enabled" -msgstr "" +msgstr "启用" #: templates/zerver/lightbox_overlay.html:14 msgid "Open" @@ -998,7 +999,7 @@ msgstr "下载" #: templates/zerver/login.html:27 msgid "Sign in to Zulip" -msgstr "" +msgstr "登陆到Zulip" #: templates/zerver/login.html:35 msgid "Sign in with SSO" @@ -1006,7 +1007,7 @@ msgstr "一键式登录" #: templates/zerver/login.html:82 msgid "Email or username" -msgstr "" +msgstr "邮箱或用户名" #: templates/zerver/login.html:84 msgid "Username" @@ -1020,7 +1021,7 @@ msgstr "密码" #: templates/zerver/login.html:106 msgid "" "You've already registered with this email address. Please sign in below." -msgstr "" +msgstr "你的这个电子邮件地址已经使用过了，请确认下面的信息" #: templates/zerver/login.html:116 msgid "Sign in" @@ -1034,114 +1035,144 @@ msgstr "用Google帐户登录" msgid "Sign in with GitHub" msgstr "用GitHub帐户登录" -#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:81 +#: templates/zerver/markdown_help.html:2 templates/zerver/navbar.html:103 msgid "Message formatting" msgstr "消息语法格式" -#: templates/zerver/markdown_help.html:7 +#: templates/zerver/markdown_help.html:8 msgid "You type" msgstr "输入" -#: templates/zerver/markdown_help.html:8 +#: templates/zerver/markdown_help.html:9 msgid "You get" msgstr "结果" -#: templates/zerver/markdown_help.html:95 +#: templates/zerver/markdown_help.html:97 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first Pygments short name\n" " after the first set of back-ticks.\n" " You can also make a code block by indenting each line with 4 spaces." -msgstr "" +msgstr "在多行代码块中添加语法高亮显示，\n添加语言的首先参考语言的短名称\n然后再进行输入\n当然你可以使用4个空格来进行代码缩进" -#: templates/zerver/markdown_help.html:126 +#: templates/zerver/markdown_help.html:128 msgid "" "You can also make tables\n" " with this Markdown-ish\n" " table syntax." -msgstr "" +msgstr "你也可以使用语法\n比如Markdown\n语法" #: templates/zerver/message_history.html:5 msgid "Message edit history" +msgstr "消息修改历史" + +#: templates/zerver/navbar.html:5 +msgid "Zulip needs your permission to enable desktop notifications." msgstr "" -#: templates/zerver/navbar.html:23 templates/zerver/navbar.html:24 +#: templates/zerver/navbar.html:8 +msgid "Enable notifications." +msgstr "" + +#: templates/zerver/navbar.html:12 +msgid "" +"We recommend allowing notifications. You can fully customize these at any " +"time in your settings." +msgstr "" + +#: templates/zerver/navbar.html:14 +msgid "Enable notifications" +msgstr "允许通知" + +#: templates/zerver/navbar.html:16 +msgid "Ask me later" +msgstr "" + +#: templates/zerver/navbar.html:18 +msgid "Never ask on this computer" +msgstr "" + +#: templates/zerver/navbar.html:45 templates/zerver/navbar.html:46 msgid "Search" msgstr "搜索" -#: templates/zerver/navbar.html:26 +#: templates/zerver/navbar.html:48 msgid "Exit search" -msgstr "" +msgstr "退出搜索" -#: templates/zerver/navbar.html:27 +#: templates/zerver/navbar.html:49 msgid "Search help" msgstr "搜索帮助" -#: templates/zerver/navbar.html:42 +#: templates/zerver/navbar.html:64 msgid "Menu" -msgstr "" +msgstr "菜单" -#: templates/zerver/navbar.html:54 +#: templates/zerver/navbar.html:76 msgid "Manage streams" -msgstr "" +msgstr "管理频道" -#: templates/zerver/navbar.html:59 templates/zerver/settings_overlay.html:4 +#: templates/zerver/navbar.html:81 templates/zerver/settings_overlay.html:4 #: templates/zerver/settings_overlay.html:109 msgid "Settings" msgstr "设置" -#: templates/zerver/navbar.html:65 +#: templates/zerver/navbar.html:87 msgid "Manage organization" -msgstr "" +msgstr "管理社区" -#: templates/zerver/navbar.html:71 +#: templates/zerver/navbar.html:93 msgid "User documentation" msgstr "用户文档" -#: templates/zerver/navbar.html:86 templates/zerver/search_operators.html:2 +#: templates/zerver/navbar.html:108 templates/zerver/search_operators.html:2 msgid "Search operators" -msgstr "" +msgstr "搜索管理者" -#: templates/zerver/navbar.html:92 +#: templates/zerver/navbar.html:114 msgid "Desktop & mobile apps" msgstr "桌面&移动应用" -#: templates/zerver/navbar.html:102 +#: templates/zerver/navbar.html:124 msgid "API documentation" -msgstr "API文档" +msgstr "API 文档" -#: templates/zerver/navbar.html:108 +#: templates/zerver/navbar.html:130 msgid "Statistics" -msgstr "" +msgstr "统计" -#: templates/zerver/navbar.html:115 +#: templates/zerver/navbar.html:137 msgid "Feedback" msgstr "反馈" -#: templates/zerver/navbar.html:122 +#: templates/zerver/navbar.html:144 msgid "Invite users" msgstr "邀请用户" -#: templates/zerver/navbar.html:128 +#: templates/zerver/navbar.html:150 msgid "" "Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via " "Webathena" -msgstr "" +msgstr "通过Webathena授权给Zulip用于运行您的Zephyr镜像所需的Kerberos票证（ticket）" -#: templates/zerver/navbar.html:130 +#: templates/zerver/navbar.html:152 msgid "Link with Webathena" msgstr "链接Webathena" -#: templates/zerver/navbar.html:136 templates/zerver/settings_overlay.html:102 +#: templates/zerver/navbar.html:158 templates/zerver/settings_overlay.html:102 msgid "Log out" msgstr "退出" -#: templates/zerver/navbar.html:142 +#: templates/zerver/navbar.html:164 msgid "Debug" msgstr "故障诊断" +#: templates/zerver/navbar.html:6 +msgid "You can fully configure notifications in Zulip') " +msgstr "" + #: templates/zerver/portico-header.html:6 msgid "Zulip" msgstr "Zulip" @@ -1151,14 +1182,14 @@ msgstr "Zulip" msgid "Log in" msgstr "登录" -#: templates/zerver/privacy.html:13 +#: templates/zerver/privacy.html:31 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured privacy policy.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured privacy policy.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/realm_creation_failed.html:8 @@ -1179,11 +1210,11 @@ msgid "" "

You're almost there.

\n" "

We just need you to do one last thing.

\n" " " -msgstr "" +msgstr "\n

马上就好

\n

\n还有最后一件事情\n

\n " #: templates/zerver/register.html:43 msgid "Full name or 名前" -msgstr "" +msgstr "全名或简称" #: templates/zerver/register.html:44 templates/zerver/settings_sidebar.html:17 msgid "Full name" @@ -1193,7 +1224,7 @@ msgstr "名字" msgid "" "This is used for mobile applications and other tools that require a " "password." -msgstr "" +msgstr "这是给那些要求输入密码的移动应用和其它工具用的" #: templates/zerver/register.html:71 msgid "Password strength" @@ -1201,26 +1232,26 @@ msgstr "密码强度" #: templates/zerver/register.html:87 msgid "Organization name" -msgstr "社区名称" +msgstr "社群名称" #: templates/zerver/register.html:95 msgid "Shorter is better than longer." -msgstr "" +msgstr "短比长更好一些" #: templates/zerver/register.html:101 -msgid "Subdomain" -msgstr "次级域名" +msgid "Organization URL" +msgstr "" -#: templates/zerver/register.html:121 +#: templates/zerver/register.html:132 msgid "The address you'll use to sign in to your organization." msgstr "地址，用于登录您的团队" -#: templates/zerver/register.html:141 +#: templates/zerver/register.html:153 #, python-format msgid "" "I agree to the Terms" " of Service." -msgstr "" +msgstr "我同意服务条款." #: templates/zerver/reset.html:8 msgid "Reset your password" @@ -1228,7 +1259,7 @@ msgstr "重置密码" #: templates/zerver/reset.html:30 msgid "Reset password" -msgstr "" +msgstr "重置密码" #: templates/zerver/reset_confirm.html:14 msgid "Reset your password." @@ -1249,19 +1280,19 @@ msgstr "您的密码已重设！" #: templates/zerver/reset_done.html:13 #, python-format msgid "Please log in with your new password." -msgstr "" +msgstr "请登录并使用你的新密码。" #: templates/zerver/reset_emailed.html:9 msgid "Password reset sent!" -msgstr "" +msgstr "密码重置已发送！" #: templates/zerver/reset_emailed.html:13 msgid "Check your email to finish the process." -msgstr "" +msgstr "请查收一下你的邮件以完成这一过程" #: templates/zerver/reset_emailed.html:13 msgid "(Or don't, but then why did you fill out this form?)" -msgstr "" +msgstr "(不然，那为什么你要填这个表呢？)" #: templates/zerver/right_sidebar.html:6 msgid "Send feedback" @@ -1301,7 +1332,7 @@ msgstr "搜索和指定用户的私信：" #: templates/zerver/search_operators.html:25 msgid "Narrow to group private messages with" -msgstr "" +msgstr "限定非公开的群组信息为" #: templates/zerver/search_operators.html:29 msgid "Narrow to messages sent by" @@ -1337,7 +1368,7 @@ msgstr "搜索星标消息" #: templates/zerver/search_operators.html:61 msgid "Narrow to unread messages." -msgstr "" +msgstr "缩小到未读邮件。" #: templates/zerver/search_operators.html:65 msgid "Narrow to messages containing links." @@ -1366,23 +1397,33 @@ msgid "" "\n" "

You can use any combination of these search operators in a single query. For example:

\n" "\n" -"

  stream:streamname\n" -" sender:user@example.com\n" -" keyword

\n" +"

\n" +"  \n" +" \n" +" stream:streamname\n" +" sender:user@example.com\n" +" keyword\n" +" \n" +"

\n" "\n" -"

would search for messages sent by user@example.com to stream\n" +"

\n" +" would search for messages sent by\n" +" user@example.com\n" +" to stream\n" " streamname\n" -" containing the keyword keyword.

\n" +" containing the keyword\n" +" keyword.\n" +"

\n" " " msgstr "" #: templates/zerver/settings_overlay.html:16 msgid "Your account" -msgstr "" +msgstr "你的账户" #: templates/zerver/settings_overlay.html:20 msgid "Display settings" -msgstr "" +msgstr "显示设置" #: templates/zerver/settings_overlay.html:24 msgid "Notifications" @@ -1390,27 +1431,27 @@ msgstr "通知设置" #: templates/zerver/settings_overlay.html:28 msgid "Your bots" -msgstr "" +msgstr "你的机器人" #: templates/zerver/settings_overlay.html:32 msgid "Alert words" -msgstr "" +msgstr "提示信息" #: templates/zerver/settings_overlay.html:36 msgid "Uploaded files" -msgstr "" +msgstr "已上传文件" #: templates/zerver/settings_overlay.html:40 msgid "Muted topics" -msgstr "" +msgstr "已静音主题" #: templates/zerver/settings_overlay.html:44 msgid "Zulip labs" -msgstr "" +msgstr "Zulip实验室" #: templates/zerver/settings_overlay.html:49 msgid "Organization profile" -msgstr "" +msgstr "社群资料" #: templates/zerver/settings_overlay.html:53 msgid "Organization settings" @@ -1418,7 +1459,7 @@ msgstr "社区设置" #: templates/zerver/settings_overlay.html:57 msgid "Organization permissions" -msgstr "" +msgstr "社群许可" #: templates/zerver/settings_overlay.html:61 msgid "Custom emoji" @@ -1426,23 +1467,23 @@ msgstr "自定义表情" #: templates/zerver/settings_overlay.html:65 msgid "Authentication methods" -msgstr "" +msgstr "验证方式" #: templates/zerver/settings_overlay.html:74 msgid "Deactivated users" -msgstr "" +msgstr "不活动成员" #: templates/zerver/settings_overlay.html:84 msgid "Delete streams" -msgstr "" +msgstr "删除频道" #: templates/zerver/settings_overlay.html:89 msgid "Default streams" -msgstr "" +msgstr "默认频道" #: templates/zerver/settings_overlay.html:93 msgid "Filter settings" -msgstr "" +msgstr "过滤器设置" #: templates/zerver/settings_sidebar.html:9 msgid "Edit bot" @@ -1450,7 +1491,7 @@ msgstr "编辑机器人" #: templates/zerver/settings_sidebar.html:12 msgid "Bot email" -msgstr "" +msgstr "机器人邮箱" #: templates/zerver/settings_sidebar.html:22 msgid "Owner" @@ -1472,14 +1513,14 @@ msgstr "清除头像" msgid "Save" msgstr "保存" -#: templates/zerver/terms.html:12 +#: templates/zerver/terms.html:29 #, python-format msgid "" "\n" -" This installation of Zulip does not have a configured terms of service.\n" -" Contact this server's administrator\n" -" if you have any questions.\n" -" " +" This installation of Zulip does not have a configured terms of service.\n" +" Contact this server's administrator\n" +" if you have any questions.\n" +" " msgstr "" #: templates/zerver/unsubscribe_link_error.html:5 @@ -1500,7 +1541,7 @@ msgid "" "%%20e-" "mail%%2C%%20but%%20it%%20took%%20me%%20to%%20an%%20error%%20page%%3A%%0A%%0A_____________%%0A%%0APlease%%20unsubscribe%%20me.%%0A%%0AThanks%%2C%%0A_____________%%0A\">email" " us and we'll get this squared away!" -msgstr "" +msgstr "请检查是否有完整的URL，然后再试一次。或联系我们我们会提供帮助！" #: templates/zerver/unsubscribe_success.html:5 msgid "Email settings updated" @@ -1518,11 +1559,11 @@ msgstr "您的邮件订阅设置已更新，您将不会收到%(subscription_typ msgid "" "To undo this change or review your other subscription settings, please visit" " your Zulip Settings page." -msgstr "" +msgstr "要撤消此更改或检查其他订阅设置，请访问Zulip设置页面" #: templates/zerver/why-zulip.html:23 msgid "Why Zulip?" -msgstr "" +msgstr "为什么选择Zulip" #: templates/zerver/zulipchat_migration_tos.html:1 msgid "Welcome! We think you'll like it here." @@ -1534,242 +1575,237 @@ msgid "" "

Your organization has been migrated from zulip.com to zulipchat.com! New service, same great conversation. We just need you to do one last thing.

\n" "

Accept the Zulip terms of service

\n" " " -msgstr "" +msgstr "\n

你的社群已经从Zulip.com迁移到ZulipChat.com！新的服务器，更佳的强大，下面秩序要你做一件事

\n

阅读并接受Zulip的服务条款

" -#: zerver/decorator.py:118 zerver/lib/emoji.py:42 zerver/views/invite.py:25 +#: zerver/decorator.py:119 zerver/lib/emoji.py:42 zerver/views/invite.py:25 msgid "Must be a realm administrator" msgstr "用户身份必须是管理员" -#: zerver/decorator.py:178 -#, python-format -msgid "Invalid Zulip server: %s" -msgstr "" - -#: zerver/decorator.py:180 zerver/decorator.py:227 zerver/decorator.py:232 -msgid "Invalid API key" -msgstr "API码不正确" - -#: zerver/decorator.py:183 -msgid "This API key only works on the root subdomain" -msgstr "" - -#: zerver/decorator.py:192 -msgid "This API is not available to incoming webhook bots." -msgstr "" - #: zerver/decorator.py:203 +msgid "Invalid subdomain for push notifications bouncer" +msgstr "" + +#: zerver/decorator.py:212 +msgid "This API is not available to incoming webhook bots." +msgstr "这个API不适用于传入的webhook机器人" + +#: zerver/decorator.py:223 msgid "Account not active" msgstr "帐户未激活" -#: zerver/decorator.py:206 +#: zerver/decorator.py:226 msgid "Realm for account has been deactivated" msgstr "用户所在的社区已关闭" -#: zerver/decorator.py:220 +#: zerver/decorator.py:240 msgid "Account is not associated with this subdomain" -msgstr "帐户未与任何次级域关联" +msgstr "帐户未与任何子域关联" -#: zerver/decorator.py:372 +#: zerver/decorator.py:247 zerver/decorator.py:252 +msgid "Invalid API key" +msgstr "错误的 API key" + +#: zerver/decorator.py:392 msgid "This endpoint does not accept bot requests." -msgstr "" +msgstr "该端点不接受bot请求" -#: zerver/decorator.py:448 +#: zerver/decorator.py:468 msgid "This endpoint requires HTTP basic authentication." -msgstr "" +msgstr "此端点需要HTTP基本身份验证。" -#: zerver/decorator.py:451 +#: zerver/decorator.py:471 msgid "Invalid authorization header for basic auth" msgstr "基本认证的授权头不正确" -#: zerver/decorator.py:501 +#: zerver/decorator.py:521 msgid "Not logged in" msgstr "未登录" -#: zerver/decorator.py:506 +#: zerver/decorator.py:526 msgid "Webhook bots can only access webhooks" msgstr "WebHook机器人只能访问Webhook内容" -#: zerver/decorator.py:571 +#: zerver/decorator.py:591 msgid "Access denied" msgstr "访问被拒绝" #: zerver/forms.py:55 msgid "Subdomain needs to have length 3 or greater." -msgstr "" +msgstr "子域名需要长度至少3个字符以上" #: zerver/forms.py:56 msgid "Subdomain cannot start or end with a '-'." -msgstr "" +msgstr "子域名不能以“-”开头或结尾" #: zerver/forms.py:57 msgid "Subdomain can only have lowercase letters, numbers, and '-'s." -msgstr "" +msgstr "子域只能有小写字母，数字和'-'。" #: zerver/forms.py:58 msgid "Subdomain unavailable. Please choose a different one." -msgstr "" +msgstr "子域不可用，请选择其他的域名" -#: zerver/forms.py:131 +#: zerver/forms.py:140 #, python-brace-format msgid "The organization you are trying to join using {email} does not exist." -msgstr "" +msgstr "您尝试使用{email}加入的组织不存在。" -#: zerver/forms.py:136 +#: zerver/forms.py:145 #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." -msgstr "" +msgstr "请查询来自管理员{email}的邀请" -#: zerver/forms.py:142 +#: zerver/forms.py:151 #, python-brace-format msgid "" "Your email address, {email}, is not in one of the domains that are allowed " "to register for accounts in this organization." -msgstr "" +msgstr "您的电子邮件地址{email}不在允许在该组织中注册帐户的域之一。" -#: zerver/forms.py:156 +#: zerver/forms.py:165 msgid "Please use your real email address." -msgstr "" +msgstr "请使用真实的邮件地址注册" -#: zerver/forms.py:279 +#: zerver/forms.py:288 msgid "Add up to 10 comma-separated email addresses." -msgstr "" +msgstr "用逗号（,）分割邮件，最多可添加10个" -#: zerver/forms.py:285 +#: zerver/forms.py:294 msgid "Please enter at most 10 emails." -msgstr "" +msgstr "请输入最多10个电子邮件地址" -#: zerver/lib/actions.py:717 +#: zerver/lib/actions.py:727 msgid "Unable to render message" msgstr "不能渲染消息" -#: zerver/lib/actions.py:1261 +#: zerver/lib/actions.py:1279 msgid "Missing parameter: 'to' (recipient)" -msgstr "" +msgstr "丢失的参数： 'to' (recipient)" -#: zerver/lib/actions.py:1263 +#: zerver/lib/actions.py:1281 msgid "Invalid 'op' value (should be start or stop)" -msgstr "" +msgstr "未定义'op'的值(可能是开始或是停止)" -#: zerver/lib/actions.py:1277 +#: zerver/lib/actions.py:1295 #, python-format msgid "Welcome to #**%s**." -msgstr "" +msgstr "欢迎来到#**%s**." -#: zerver/lib/actions.py:1280 +#: zerver/lib/actions.py:1298 msgid "Description" -msgstr "" +msgstr "描述" -#: zerver/lib/actions.py:1289 +#: zerver/lib/actions.py:1307 msgid "hello" -msgstr "" +msgstr "你好" -#: zerver/lib/actions.py:1349 zerver/lib/actions.py:3810 -#: zerver/views/messages.py:937 zerver/views/messages.py:944 -#: zerver/views/messages.py:969 +#: zerver/lib/actions.py:1373 zerver/lib/actions.py:3844 +#: zerver/views/messages.py:940 zerver/views/messages.py:947 +#: zerver/views/messages.py:972 msgid "User not authorized for this query" msgstr "用户没有授权本次查询" -#: zerver/lib/actions.py:1376 +#: zerver/lib/actions.py:1400 #, python-format msgid "'%s' is no longer using Zulip." msgstr "'%s'不再使用Zulip了。" -#: zerver/lib/actions.py:1382 +#: zerver/lib/actions.py:1406 msgid "You can't send private messages outside of your organization." msgstr "您不能发送私信到社区以外" -#: zerver/lib/actions.py:1489 zerver/lib/streams.py:88 +#: zerver/lib/actions.py:1513 zerver/lib/streams.py:88 #, python-format msgid "Invalid stream name '%s'" -msgstr "" +msgstr "无效的频道名'%s'" -#: zerver/lib/actions.py:1491 +#: zerver/lib/actions.py:1515 #, python-format msgid "Stream name too long (limit: %s characters)" -msgstr "" +msgstr "频道名称太长(限制于:%s字符)" -#: zerver/lib/actions.py:1494 +#: zerver/lib/actions.py:1518 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." -msgstr "" +msgstr "频道名称 '%s' 包含了 NULL (0x00) 无效字符" -#: zerver/lib/actions.py:1555 +#: zerver/lib/actions.py:1579 msgid "Message must not be empty" msgstr "消息不能为空" -#: zerver/lib/actions.py:1557 +#: zerver/lib/actions.py:1581 msgid "Message must not contain null bytes" -msgstr "" +msgstr "消息不能包含空字节" -#: zerver/lib/actions.py:1572 +#: zerver/lib/actions.py:1596 msgid "Missing topic" msgstr "话题不存在" -#: zerver/lib/actions.py:1575 zerver/views/messages.py:1087 +#: zerver/lib/actions.py:1599 zerver/views/messages.py:1091 msgid "Topic can't be empty" msgstr "话题不能为空" -#: zerver/lib/actions.py:1585 +#: zerver/lib/actions.py:1609 #, python-format msgid "Stream '%(stream_name)s' does not exist" -msgstr "" +msgstr "频道“%(stream_name)s”不存在" -#: zerver/lib/actions.py:1607 +#: zerver/lib/actions.py:1631 #, python-format msgid "Not authorized to send to stream '%s'" msgstr "没有权限向频道'%s'发送消息" -#: zerver/lib/actions.py:1613 +#: zerver/lib/actions.py:1637 msgid "Message must have recipients" msgstr "消息必须指定接收人" -#: zerver/lib/actions.py:1624 zerver/lib/addressee.py:111 +#: zerver/lib/actions.py:1648 zerver/lib/addressee.py:111 #: zerver/lib/outgoing_webhook.py:147 msgid "Invalid message type" msgstr "消息类型不正确" -#: zerver/lib/actions.py:1793 +#: zerver/lib/actions.py:1817 msgid "You cannot get subscribers for public streams in this realm" msgstr "您不能获取指定社区的公开频道的用户" -#: zerver/lib/actions.py:1796 +#: zerver/lib/actions.py:1820 msgid "Unable to retrieve subscribers for invite-only stream" msgstr "不能获取私有频道的用户" -#: zerver/lib/actions.py:2433 zerver/views/users.py:71 +#: zerver/lib/actions.py:2469 zerver/views/users.py:71 #: zerver/views/users.py:84 zerver/views/users.py:100 #: zerver/views/users.py:170 zerver/views/users.py:228 msgid "Insufficient permission" msgstr "权限不足" -#: zerver/lib/actions.py:2980 zerver/lib/actions.py:2982 -#: zerver/lib/message.py:290 zerver/lib/message.py:301 -#: zerver/lib/message.py:306 zerver/lib/message.py:310 +#: zerver/lib/actions.py:3013 zerver/lib/actions.py:3015 +#: zerver/lib/message.py:415 zerver/lib/message.py:426 +#: zerver/lib/message.py:431 zerver/lib/message.py:435 msgid "Invalid message(s)" msgstr "消息不正确" -#: zerver/lib/actions.py:3597 +#: zerver/lib/actions.py:3630 msgid "Invalid address." msgstr "地址不正确" -#: zerver/lib/actions.py:3600 +#: zerver/lib/actions.py:3633 msgid "Outside your domain." msgstr "不属于该社区" -#: zerver/lib/actions.py:3605 +#: zerver/lib/actions.py:3638 msgid "Already has an account." msgstr "帐户已经存在" -#: zerver/lib/actions.py:3640 +#: zerver/lib/actions.py:3673 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "一些邮箱没有通过验证，因此我们没有发送邀请" -#: zerver/lib/actions.py:3645 +#: zerver/lib/actions.py:3678 msgid "We weren't able to invite anyone." msgstr "没有邀请任何人" -#: zerver/lib/actions.py:3663 +#: zerver/lib/actions.py:3697 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" @@ -1786,53 +1822,53 @@ msgstr "不能发送到多个频道" #: zerver/lib/addressee.py:104 msgid "Missing stream" -msgstr "" +msgstr "失踪的频道" #: zerver/lib/attachments.py:22 msgid "Invalid attachment" -msgstr "" +msgstr "无效的附件文件" #: zerver/lib/attachments.py:30 msgid "" "An error occured while deleting the attachment. Please try again later." -msgstr "" +msgstr "删除附件文件时遇到错误，请稍后再试" #: zerver/lib/domains.py:10 msgid "Domain can't be empty." -msgstr "" +msgstr "域名不能为空。" #: zerver/lib/domains.py:12 msgid "Domain must have at least one dot (.)" -msgstr "" +msgstr "域名必须至少包含一个点(.)" #: zerver/lib/domains.py:14 msgid "Domain cannot start or end with a dot (.)" -msgstr "" +msgstr "域名不能以点(.)为开始或结束" #: zerver/lib/domains.py:17 msgid "Consecutive '.' are not allowed." -msgstr "" +msgstr "不允许连续的\".\"（dot）" #: zerver/lib/domains.py:19 msgid "Subdomains cannot start or end with a '-'." -msgstr "" +msgstr "子域名不能以“-”开头或结尾" #: zerver/lib/domains.py:21 msgid "Domain can only have letters, numbers, '.' and '-'s." -msgstr "" +msgstr "域名允许包含字母或数字，以及'-'" #: zerver/lib/emoji.py:27 #, python-format msgid "Emoji '%s' does not exist" -msgstr "" +msgstr "表情“%s”不存在" #: zerver/lib/emoji.py:54 msgid "Must be a realm administrator or emoji author" -msgstr "" +msgstr "必须是领域管理员或表情符号作者" -#: zerver/lib/emoji.py:60 zerver/models.py:368 +#: zerver/lib/emoji.py:60 zerver/models.py:379 msgid "Invalid characters in emoji name" -msgstr "" +msgstr "表情符号名称中无效的字符" #: zerver/lib/error_notify.py:133 msgid "Invalid type parameter" @@ -1842,85 +1878,89 @@ msgstr "参数类型不正确" msgid "Could not allocate event queue" msgstr "无法分配事件队列" -#: zerver/lib/integrations.py:36 -msgid "Integration frameworks" -msgstr "" - #: zerver/lib/integrations.py:37 -msgid "Continuous integration" -msgstr "" +msgid "Integration frameworks" +msgstr "集成框架" #: zerver/lib/integrations.py:38 -msgid "Customer support" -msgstr "" +msgid "Continuous integration" +msgstr "持续集成" #: zerver/lib/integrations.py:39 -msgid "Deployment" -msgstr "" +msgid "Customer support" +msgstr "客户支持" #: zerver/lib/integrations.py:40 -msgid "Communication" -msgstr "" +msgid "Deployment" +msgstr "部署" #: zerver/lib/integrations.py:41 -msgid "Financial" -msgstr "" +msgid "Communication" +msgstr "通信" #: zerver/lib/integrations.py:42 -msgid "HR" -msgstr "" +msgid "Financial" +msgstr "财务" #: zerver/lib/integrations.py:43 -msgid "Marketing" -msgstr "" +msgid "HR" +msgstr "HR" #: zerver/lib/integrations.py:44 -msgid "Miscellaneous" -msgstr "" +msgid "Marketing" +msgstr "销售" #: zerver/lib/integrations.py:45 -msgid "Monitoring tools" -msgstr "" +msgid "Miscellaneous" +msgstr "杂项" #: zerver/lib/integrations.py:46 -msgid "Project management" -msgstr "" +msgid "Monitoring tools" +msgstr "监测工具" #: zerver/lib/integrations.py:47 -msgid "Productivity" -msgstr "" +msgid "Project management" +msgstr "工程管理" #: zerver/lib/integrations.py:48 -msgid "Version control" -msgstr "" +msgid "Productivity" +msgstr "效率" #: zerver/lib/integrations.py:49 +msgid "Version control" +msgstr "版本控制" + +#: zerver/lib/integrations.py:50 msgid "Interactive bots" -msgstr "" +msgstr "交互机器人" #: zerver/lib/narrow.py:12 #, python-format msgid "Operator %s not supported." msgstr "不支持操作符：%s" -#: zerver/lib/push_notifications.py:260 zerver/lib/push_notifications.py:265 -#: zerver/lib/push_notifications.py:268 -msgid "Error received from push notification bouncer" +#: zerver/lib/push_notifications.py:285 +msgid "Received 500 from push notification bouncer" msgstr "" -#: zerver/lib/push_notifications.py:343 zilencer/views.py:72 +#: zerver/lib/push_notifications.py:293 +#, python-format +msgid "Push notifications bouncer error: %s" +msgstr "" + +#: zerver/lib/push_notifications.py:379 zilencer/views.py:66 msgid "Token does not exist" msgstr "Token不存在" #: zerver/lib/request.py:29 #, python-brace-format msgid "Missing '{var_name}' argument" -msgstr "" +msgstr "缺少参数： '{var_name}' " #: zerver/lib/request.py:43 #, python-brace-format msgid "Bad value for '{var_name}': {bad_value}" -msgstr "" +msgstr "错误值：'{var_name}': {bad_value}" #: zerver/lib/request.py:135 msgid "Malformed JSON" @@ -1933,7 +1973,7 @@ msgstr "参数类型不正确" #: zerver/lib/request.py:166 #, python-format msgid "Argument \"%s\" is not valid JSON." -msgstr "" +msgstr "参数“%s”无效JSON。" #: zerver/lib/rest.py:113 zerver/lib/rest.py:116 msgid "Not logged in: API authentication or user session required" @@ -1941,12 +1981,12 @@ msgstr "未登录：提供用户会话或者API认证" #: zerver/lib/streams.py:22 zerver/lib/streams.py:68 msgid "Invalid stream id" -msgstr "" +msgstr "无效的频道ID" #: zerver/lib/streams.py:82 #, python-format msgid "Stream name '%s' is already taken" -msgstr "" +msgstr "频道名称“%s”已经获得" #: zerver/lib/streams.py:208 msgid "User cannot create streams." @@ -1959,11 +1999,11 @@ msgstr "频道（%s）不存在" #: zerver/lib/upload.py:111 msgid "Animated emoji must be have same width and height." -msgstr "" +msgstr "动画表情符号必须具有相同的宽度和高度。" #: zerver/lib/upload.py:114 msgid "Animated emoji can't be larger than 64px in width or height." -msgstr "" +msgstr "动画表情不能大于宽高64px。" #: zerver/lib/users.py:13 msgid "Name too long!" @@ -1977,17 +2017,17 @@ msgstr "名称太短！" msgid "Invalid characters in name!" msgstr "名称中有无效字符！" -#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:367 +#: zerver/lib/users.py:24 zerver/views/users.py:261 zerver/views/users.py:412 msgid "Bad name or username" msgstr "名字或者用户名错误" #: zerver/lib/users.py:40 msgid "Invalid bot type" -msgstr "" +msgstr "无效的机器人类型" #: zerver/lib/users.py:45 msgid "Invalid interface type" -msgstr "" +msgstr "无效的接口类型" #: zerver/lib/validator.py:40 #, python-format @@ -1997,7 +2037,7 @@ msgstr "%s不是字符串" #: zerver/lib/validator.py:47 #, python-brace-format msgid "{var_name} is longer than {max_length}." -msgstr "" +msgstr "{var_name}不可以长于 {max_length}." #: zerver/lib/validator.py:54 #, python-format @@ -2007,7 +2047,7 @@ msgstr "%s不是整数类型" #: zerver/lib/validator.py:60 #, python-format msgid "%s is not a float" -msgstr "" +msgstr "%s不是浮标（float）" #: zerver/lib/validator.py:66 #, python-format @@ -2037,7 +2077,7 @@ msgstr "%(var_name)s中不存在键值%(key_name)s" #: zerver/lib/validator.py:119 #, python-format msgid "Unexpected arguments: %s" -msgstr "" +msgstr "意想不到的讨论：%s" #: zerver/lib/validator.py:143 #, python-format @@ -2049,76 +2089,80 @@ msgstr "%s不是可接受的数据类型" msgid "%(variable)s != %(expected_value)s (%(value)s is wrong)" msgstr "%(variable)s != %(expected_value)s (%(value)s is wrong)" -#: zerver/middleware.py:291 +#: zerver/middleware.py:292 msgid "Internal server error" msgstr "服务器内部错误" -#: zerver/middleware.py:318 +#: zerver/middleware.py:319 #, python-brace-format msgid "CSRF Error: {reason}" -msgstr "" +msgstr "CSRF错误: {reason}" -#: zerver/middleware.py:348 +#: zerver/middleware.py:349 msgid "API usage exceeded rate limit" -msgstr "" +msgstr "API请求超过了限制" -#: zerver/models.py:635 +#: zerver/models.py:646 msgid "Apple style" msgstr "Apple风格" -#: zerver/models.py:636 +#: zerver/models.py:647 msgid "Emoji One style" -msgstr "" +msgstr "Emoji One 风格" -#: zerver/models.py:637 +#: zerver/models.py:648 msgid "Google style" msgstr "Google风格" -#: zerver/models.py:638 +#: zerver/models.py:649 msgid "Twitter style" msgstr "Twitter风格" -#: zerver/models.py:1237 +#: zerver/models.py:1208 msgid "Unicode emoji" -msgstr "" +msgstr "Unicode 表情符号" -#: zerver/models.py:1238 +#: zerver/models.py:1209 msgid "Realm emoji" -msgstr "" +msgstr "社区表情" -#: zerver/models.py:1239 +#: zerver/models.py:1210 msgid "Zulip extra emoji" -msgstr "" +msgstr "Zulip额外表情" -#: zerver/tornado/event_queue.py:510 zerver/tornado/socket.py:136 +#: zerver/tornado/event_queue.py:520 zerver/tornado/socket.py:141 msgid "Missing 'queue_id' argument" msgstr "缺少参数'queue_id'" -#: zerver/tornado/event_queue.py:513 +#: zerver/tornado/event_queue.py:523 msgid "Missing 'last_event_id' argument" msgstr "缺少参数'last_event_id'" -#: zerver/tornado/event_queue.py:518 +#: zerver/tornado/event_queue.py:528 msgid "You are not authorized to get events from this queue" msgstr "没有权限从该队列获取事件" #: zerver/tornado/exceptions.py:18 #, python-brace-format msgid "Bad event queue id: {queue_id}" -msgstr "" +msgstr "不良事件队列ID：{queue_id}" -#: zerver/tornado/socket.py:129 +#: zerver/tornado/socket.py:130 msgid "Unknown or missing session" +msgstr "未知或过期的Session" + +#: zerver/tornado/socket.py:136 +msgid "CSRF token entry missing from request" msgstr "" -#: zerver/tornado/socket.py:133 +#: zerver/tornado/socket.py:138 msgid "CSRF token does not match that in cookie" -msgstr "" +msgstr "CSRF Token 与当前Cookie不匹配" -#: zerver/tornado/socket.py:144 +#: zerver/tornado/socket.py:149 #, python-format msgid "You are not the owner of the queue with id '%s'" -msgstr "" +msgstr "您不是ID（%s）队列的所有者。" #: zerver/tornado/views.py:35 msgid "You are not authorized to access this queue" @@ -2130,7 +2174,7 @@ msgstr "未设置REMOTE_USER" #: zerver/views/auth.py:193 msgid "Auth key for this subdomain not found." -msgstr "" +msgstr "找不到此子域的Auth key" #: zerver/views/auth.py:200 msgid "No JSON web token passed in request" @@ -2146,53 +2190,53 @@ msgstr "JSON web token声明中未指明用户" #: zerver/views/auth.py:209 msgid "No realm specified in JSON web token claims" -msgstr "" +msgstr "JSON web token 声明中没有指定领域" #: zerver/views/auth.py:224 msgid "Wrong subdomain" -msgstr "错误的次级域名" +msgstr "错误的子域名" #: zerver/views/auth.py:265 msgid "Invalid OTP" -msgstr "" +msgstr "无效的OTP" -#: zerver/views/auth.py:566 zerver/views/auth.py:594 +#: zerver/views/auth.py:571 zerver/views/auth.py:599 msgid "Dev environment not enabled." msgstr "未使能开发环境" -#: zerver/views/auth.py:579 zerver/views/auth.py:623 +#: zerver/views/auth.py:584 zerver/views/auth.py:628 msgid "Your realm has been deactivated." msgstr "您的社区已关闭" -#: zerver/views/auth.py:582 zerver/views/auth.py:620 +#: zerver/views/auth.py:587 zerver/views/auth.py:625 msgid "Your account has been disabled." msgstr "帐户已经停用" -#: zerver/views/auth.py:585 +#: zerver/views/auth.py:590 msgid "This user is not registered." -msgstr "" +msgstr "此用户未注册。" -#: zerver/views/auth.py:626 +#: zerver/views/auth.py:631 msgid "Password auth is disabled in your team." msgstr "社区已停用密码认证" -#: zerver/views/auth.py:631 +#: zerver/views/auth.py:636 msgid "This user is not registered; do so from a browser." msgstr "当前用户未注册，请从浏览器执行该动作" -#: zerver/views/auth.py:633 zerver/views/auth.py:712 +#: zerver/views/auth.py:638 zerver/views/auth.py:717 msgid "Your username or password is incorrect." msgstr "用户名和密码不正确" -#: zerver/views/auth.py:658 +#: zerver/views/auth.py:663 msgid "Invalid subdomain" -msgstr "" +msgstr "无效的子域名" -#: zerver/views/auth.py:664 +#: zerver/views/auth.py:669 msgid "Subdomain required" -msgstr "" +msgstr "需要子域名" -#: zerver/views/auth.py:719 +#: zerver/views/auth.py:724 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "未配置GOOGLE_CLIENT_ID" @@ -2215,12 +2259,12 @@ msgstr "该名称已存在。" #: zerver/views/custom_profile_fields.py:92 #, python-brace-format msgid "Field id {id} not found." -msgstr "" +msgstr "找不到字段ID {id}" #: zerver/views/hotspots.py:16 #, python-format msgid "Unknown hotspot: %s" -msgstr "" +msgstr "未知热区：%s" #: zerver/views/invite.py:27 msgid "You must specify at least one email address." @@ -2238,51 +2282,51 @@ msgstr "频道不存在：%s。没有发送邀请" #: zerver/views/messages.py:71 #, python-brace-format msgid "Invalid narrow operator: {desc}" -msgstr "" +msgstr "无效的窄运算符：{desc}" -#: zerver/views/messages.py:822 +#: zerver/views/messages.py:825 #, python-format msgid "No such topic '%s'" msgstr "话题不存在'%s'" -#: zerver/views/messages.py:947 +#: zerver/views/messages.py:950 #, python-format msgid "Unknown realm %s" -msgstr "" +msgstr "未知的领域%s" -#: zerver/views/messages.py:967 +#: zerver/views/messages.py:970 msgid "Missing sender" msgstr "缺少发送人" -#: zerver/views/messages.py:973 +#: zerver/views/messages.py:976 msgid "Invalid mirrored message" msgstr "镜像消息不正确（Invalid mirrored message）" -#: zerver/views/messages.py:975 +#: zerver/views/messages.py:978 msgid "Invalid mirrored realm" msgstr "镜像域名不正确（Invalid mirrored realm）" -#: zerver/views/messages.py:978 +#: zerver/views/messages.py:981 msgid "IRC stream names must start with #" msgstr "IRC频道名称必须以#开头" -#: zerver/views/messages.py:1036 +#: zerver/views/messages.py:1040 msgid "Message edit history is disabled in this organization" -msgstr "" +msgstr "社群内禁止更改消息历史记录" -#: zerver/views/messages.py:1054 +#: zerver/views/messages.py:1058 msgid "Your organization has turned off message editing" -msgstr "" +msgstr "您的社群已关闭邮件编辑" -#: zerver/views/messages.py:1069 zerver/views/messages.py:1138 +#: zerver/views/messages.py:1073 zerver/views/messages.py:1142 msgid "You don't have permission to edit this message" msgstr "您没有权限编辑该消息" -#: zerver/views/messages.py:1080 +#: zerver/views/messages.py:1084 msgid "The time limit for editing this message has past" -msgstr "" +msgstr "已经错过了可以修改消息的时间" -#: zerver/views/messages.py:1083 +#: zerver/views/messages.py:1087 msgid "Nothing to change" msgstr "无需修改（Nothing to change）" @@ -2292,7 +2336,7 @@ msgstr "话题已静音" #: zerver/views/muting.py:29 msgid "Topic is not there in the muted_topics list" -msgstr "" +msgstr "主题不存在与 muted_topics 列表中" #: zerver/views/pointer.py:29 msgid "Invalid message ID" @@ -2307,17 +2351,17 @@ msgstr "不存在该用户" #: zerver/views/presence.py:34 msgid "Presence is not supported for bot users." -msgstr "" +msgstr "不支持机器人的用户不存在。" #: zerver/views/presence.py:38 #, python-format msgid "No presence data for %s" -msgstr "" +msgstr "没有存在的数据：%s" #: zerver/views/presence.py:59 #, python-format msgid "Invalid status: %s" -msgstr "" +msgstr "无效属性：%s" #: zerver/views/push_notifications.py:22 msgid "Empty or invalid length token" @@ -2325,15 +2369,15 @@ msgstr "Token为空或者长度不正确" #: zerver/views/push_notifications.py:28 msgid "Invalid APNS token" -msgstr "" +msgstr "无效的 APNS token" -#: zerver/views/reactions.py:30 +#: zerver/views/reactions.py:41 msgid "Reaction already exists" -msgstr "" +msgstr "映射已经存在" -#: zerver/views/reactions.py:61 +#: zerver/views/reactions.py:63 msgid "Reaction does not exist" -msgstr "" +msgstr "映射不存在" #: zerver/views/realm.py:49 zerver/views/user_settings.py:155 #, python-format @@ -2342,64 +2386,64 @@ msgstr "语言不正确 '%s'" #: zerver/views/realm.py:51 msgid "Realm description is too long." -msgstr "" +msgstr "领域描述太长。" #: zerver/views/realm.py:53 msgid "Realm name is too long." -msgstr "" +msgstr "映射值太长" #: zerver/views/realm.py:55 msgid "At least one authentication method must be enabled." -msgstr "" +msgstr "必须至少启用一种身份验证方法。" #: zerver/views/realm_domains.py:29 msgid "Invalid domain: {}" -msgstr "" +msgstr "无效的域名：{}" #: zerver/views/realm_domains.py:31 #, python-format msgid "The domain %(domain)s is already a part of your organization." -msgstr "" +msgstr "这个域名 %(domain)s 已经是你组织的一部分。" #: zerver/views/realm_domains.py:43 zerver/views/realm_domains.py:54 #, python-format msgid "No entry found for domain %(domain)s." -msgstr "" +msgstr "找不到域的条目%(domain)s。" #: zerver/views/realm_emoji.py:31 msgid "You must upload exactly one file." -msgstr "" +msgstr "你只能上传一个文件。" #: zerver/views/realm_emoji.py:34 zerver/views/realm_icon.py:23 #: zerver/views/upload.py:60 zerver/views/user_settings.py:218 #, python-format msgid "Uploaded file is larger than the allowed limit of %s MB" -msgstr "" +msgstr "文件上传大小限制%sMB" #: zerver/views/realm_filters.py:45 msgid "Filter not found" -msgstr "" +msgstr "过滤器未找到" #: zerver/views/realm_icon.py:19 msgid "You must upload exactly one icon." -msgstr "" +msgstr "你必须上传一个图标" -#: zerver/views/registration.py:294 +#: zerver/views/registration.py:295 msgid "New organization creation disabled." -msgstr "已禁止创建新团队" +msgstr "已禁止创建新社群" -#: zerver/views/registration.py:297 +#: zerver/views/registration.py:298 msgid "The organization creation link has expired or is not valid." -msgstr "" +msgstr "社群的链接过期或无效" #: zerver/views/streams.py:47 #, python-brace-format msgid "User not authorized to execute queries on behalf of '{principal}'" -msgstr "" +msgstr "用户无权使用“{principal}”执行查询" #: zerver/views/streams.py:97 msgid "Stream already has that name!" -msgstr "" +msgstr "频道已经有了这个名字！" #: zerver/views/streams.py:119 msgid "Nothing to do. Specify at least one of \"add\" or \"delete\"." @@ -2421,7 +2465,7 @@ msgstr "不能访问频道（%s）" #: zerver/views/streams.py:255 msgid "" "You can only invite other Zephyr mirroring users to invite-only streams." -msgstr "" +msgstr "您只能邀请其他Zephyr镜像用户到仅限邀请频道。" #: zerver/views/streams.py:455 #, python-format @@ -2431,19 +2475,15 @@ msgstr "未知订阅属性：%s" #: zerver/views/streams.py:459 #, python-format msgid "Not subscribed to stream id %d" -msgstr "" - -#: zerver/views/tutorial.py:29 -msgid "Bad data passed in to tutorial_send_message" -msgstr "向tutorial_send_message传递了错误数据" +msgstr "没有订阅频道%d" #: zerver/views/upload.py:42 msgid "

File not found.

" -msgstr "" +msgstr "

文件不存在

" #: zerver/views/upload.py:44 msgid "

You are not authorized to view this file.

" -msgstr "" +msgstr "

没有权限查看这个文件！

" #: zerver/views/upload.py:53 msgid "You must specify a file to upload" @@ -2456,15 +2496,15 @@ msgstr "一次只可以上传一个文件" #: zerver/views/upload.py:63 msgid "Upload would exceed your maximum quota." -msgstr "" +msgstr "上传超过您的用户限额。" #: zerver/views/user_settings.py:36 zerver/views/user_settings.py:121 msgid "Email address changes are disabled in this organization." -msgstr "" +msgstr "本社群禁止更改电子邮件地址。" #: zerver/views/user_settings.py:94 msgid "No new data supplied" -msgstr "" +msgstr "没有提供新的数据" #: zerver/views/user_settings.py:98 msgid "New password must match confirmation password!" @@ -2476,17 +2516,17 @@ msgstr "密码错误！" #: zerver/views/user_settings.py:129 msgid "Check your email for a confirmation link. " -msgstr "" +msgstr "在你的邮件中检查激活链接。" #: zerver/views/user_settings.py:159 #, python-format msgid "Invalid timezone '%s'" -msgstr "" +msgstr "无效的时区'%s'" #: zerver/views/user_settings.py:163 #, python-format msgid "Invalid emojiset '%s'" -msgstr "" +msgstr "无效的表情定义“%s”" #: zerver/views/user_settings.py:214 msgid "You must upload exactly one avatar." @@ -2494,7 +2534,7 @@ msgstr "必须上传恰好一个头像文件" #: zerver/views/users.py:42 zerver/views/users.py:49 msgid "Cannot deactivate the only organization administrator" -msgstr "" +msgstr "无法停用唯一的社群管理员" #: zerver/views/users.py:63 zerver/views/users.py:65 msgid "No such bot" @@ -2502,18 +2542,18 @@ msgstr "机器人不存在" #: zerver/views/users.py:104 msgid "Cannot remove the only organization administrator" -msgstr "" +msgstr "无法移除唯一的社群管理员" #: zerver/views/users.py:264 msgid "Username already in use" msgstr "用户名已被占用" -#: zerver/views/users.py:374 +#: zerver/views/users.py:419 #, python-format msgid "Email '%(email)s' not allowed for realm '%(realm)s'" -msgstr "" +msgstr "邮件“%(email)s”不允许的域“%(realm)s”" -#: zerver/views/users.py:379 +#: zerver/views/users.py:424 #, python-format msgid "Email '%s' already in use" msgstr "邮箱'%s'已经使用" @@ -2524,7 +2564,7 @@ msgstr "没有找到 Kerberos凭证" #: zerver/views/zephyr.py:34 msgid "Webathena login not enabled" -msgstr "" +msgstr "Webathena登录不启用" #: zerver/views/zephyr.py:44 msgid "Invalid Kerberos cache" @@ -2541,7 +2581,7 @@ msgstr "JSON中缺少键值 %s" #: zerver/webhooks/gogs/view.py:97 msgid "Invalid event \"{}\" in request headers" -msgstr "" +msgstr "请求头中的无效事件“{}”" #: zerver/webhooks/ifttt/view.py:19 zerver/webhooks/zapier/view.py:19 msgid "Subject can't be empty" @@ -2553,7 +2593,7 @@ msgstr "内容不能为空" #: zerver/webhooks/jira/view.py:263 msgid "Event is not given by JIRA" -msgstr "" +msgstr "事件不是由JIRA放出" #: zerver/webhooks/librato/view.py:170 msgid "Malformed JSON input" @@ -2574,7 +2614,7 @@ msgstr "无法处理Pivotal的payload" #: zerver/webhooks/slack/view.py:24 msgid "Error: channels_map_to_topics parameter other than 0 or 1" -msgstr "" +msgstr "channels_map_to_topics 不应该有除了0和1以外的参数" #: zerver/webhooks/slack/view.py:30 msgid "Message from Slack" @@ -2596,16 +2636,16 @@ msgstr "不支持的动作类型: {action_type}" #: zerver/webhooks/updown/view.py:83 #, python-format msgid "Unsupported Updown event type: %s" -msgstr "" +msgstr "不支持的Updown事件类型：%s" #: zerver/webhooks/wordpress/view.py:42 msgid "Unknown WordPress webhook action: " -msgstr "" +msgstr "未知的 WordPress webhook 方法" -#: zilencer/views.py:23 +#: zilencer/views.py:22 msgid "Must validate with valid Zulip server API key" -msgstr "" +msgstr "必须验证有效的Zulip服务器 API Key" -#: zilencer/views.py:28 +#: zilencer/views.py:27 msgid "Invalid token type" -msgstr "" +msgstr "无效的Token类型" diff --git a/static/locale/zh_Hans/translations.json b/static/locale/zh_Hans/translations.json index df12afdb55..3dea7792b9 100644 --- a/static/locale/zh_Hans/translations.json +++ b/static/locale/zh_Hans/translations.json @@ -1,270 +1,272 @@ { - "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", + "\"__file_name__\" was too large; the maximum file size is 25MiB.": "\"__file_name__\"看起来太大了，最大限制是25M。", + "(This user has been deactivated)": "", "(no topic)": "(无主题)", - "24-hour time (17:00 instead of 5:00 PM)": "", - "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "", - "Public: anyone can join; anyone can view complete message history without joining": "", - "

Lets everyone know about the new stream,
even if you don't add them.

": "", + "24-hour time (17:00 instead of 5:00 PM)": "24小时时间 (例如17:00而不是5:00PM)", + "Private: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "私人：必须由成员邀请，才能参加讨论话题，而且只能查看加入后的消息，隐藏管理员用户。", + "Public: anyone can join; anyone can view complete message history without joining": "公开：任何人都可以在不加入群组的状态下参与话题以及查看，发送消息。", + "

Lets everyone know about the new stream,
even if you don't add them.

": "

让任何人都知道这个新群组，
如果你不添加他们的话

", "__name__ is not subscribed to this stream.": "__name__ 没有订阅这个频道。", - "A stream needs to have a name": "", - "A stream with this name already exists": "", - "API key": "", - "Action": "", + "A stream needs to have a name": "频道需要一个名字", + "A stream with this name already exists": "具有此名称的频道已经存在了", + "API key": "API Key", + "Action": "可用", "Actions": "操作", - "Active bots": "", - "Active now": "", + "Active bots": "可用的机器人", + "Active now": "现在激活", "Active users": "活动用户", "Add": "添加", - "Add a new alert word": "", - "Add a new bot": "", - "Add a new emoji": "", - "Add a new filter": "", - "Add alert word": "", + "Add a new alert word": "添加一个新的提示信息", + "Add a new bot": "添加新的机器人", + "Add a new emoji": "增加一个新的表情", + "Add a new filter": "增加一个新的过滤器", + "Add alert word": "添加提示信息", "Add emoji": "添加表情", - "Add emoji reaction": "", - "Add emoji reaction (:)": "", - "Add extra emoji for members of the __realm_name__ organization.": "", - "Add filter": "", - "Add new default stream": "", - "Add stream": "", - "Added successfully!": "", - "Alert word": "", - "Alert word added successfully!": "", - "Alert word already exists!": "", - "Alert word can't be empty!": "", - "Alert word removed successfully!": "", - "Alert words": "", - "Alert words allow you to be notified as if you were @-mentioned when certain words or phrases are used in Zulip.": "", + "Add emoji reaction": "添加表情映射", + "Add emoji reaction (:)": "添加表情映射 (:)", + "Add extra emoji for members of the __realm_name__ organization.": "允许社群 __realm_name__ 的成员添加额外的表情包。", + "Add filter": "添加过滤器", + "Add new default stream": "添加默认频道", + "Add stream": "添加频道", + "Added successfully!": "添加成功！", + "Alert word": "提示信息", + "Alert word added successfully!": "提示词添加成功！", + "Alert word already exists!": "提示信息已经存在", + "Alert word can't be empty!": "提示信息不能为空", + "Alert word removed successfully!": "提示信息移除成功！", + "Alert words": "提示信息", + "Alert words allow you to be notified as if you were @-mentioned when certain words or phrases are used in Zulip.": "当消息中出现提示词后，您会收到通知，就像@提醒一样。", "All streams": "所有频道", - "Allow subdomains": "", - "Allowed domains": "", + "Allow subdomains": "允许子域名", + "Allowed domains": "允许的域名", "Already subscribed to __stream__": "订阅频道\"__stream__\"成功", "Always auto-scroll to new messages": "自动滚动到新消息", - "An API key can be used to programmatically access a Zulip account. Anyone with access to your API key has the ability to read your messages, send messages on your behalf, and otherwise impersonate you on Zulip, so you should guard your API key as carefully as you guard your password.
We recommend creating bots and using the bots' accounts and API keys to access the Zulip API, unless the task requires access to your account.": "", - "An unknown error occurred.": "", + "An API key can be used to programmatically access a Zulip account. Anyone with access to your API key has the ability to read your messages, send messages on your behalf, and otherwise impersonate you on Zulip, so you should guard your API key as carefully as you guard your password.
We recommend creating bots and using the bots' accounts and API keys to access the Zulip API, unless the task requires access to your account.": "API Key用于编程开发访问你的Zulip账户，任何人使用你的Key都可以：读取你的信息，使用你的身份发送信息，所以请不要公开API Key，像保护你的银行卡密码一样保护好它
我们建议创建机器人账户权限的API Key来访问Zulip API，除非某些特定任务需要访问你的账户。", + "An unknown error occurred.": "发生了一个未知错误。", "Announce stream": "公布频道信息", - "Any user may now add new emoji!": "", + "Any user may now add new emoji!": "任何用户现在都可以添加新的表情！", "Any user may now create new streams!": "现在所有用户都可以创建频道！", "Any user may now invite new users!": "现在所有用户都可以邀请新用户！", - "Anyone in this organization can add custom emoji.": "", + "Anyone in this organization can add custom emoji.": "在这个圈子中任何人都可以添加自定义表情符号。", "Apply this change to all stream subscriptions?": "应用到所有频道用户", - "Are you sure you want to create stream '__stream_name__' and subscribe __count__ users to it?": "", + "Are you sure you want to create stream '__stream_name__' and subscribe __count__ users to it?": "你确定要创建频道 '__stream_name__' 和 签订 __count__ 用户到这里？", "Are you sure you want to do this?": "确定这样做？", - "Are you sure you want to mention all __count__ people in this stream?": "", - "Attachment deleted": "", + "Are you sure you want to mention all __count__ people in this stream?": "确定提醒该频道中的__count__个用户？", + "Attachment deleted": "附件文件已删除", "Audible notifications": "声音通知", - "Authentication methods saved!": "", - "Author": "", - "Authorization methods": "", - "Base URL": "", - "Bot": "", - "Bot list": "", - "Bot type": "", - "Bringing you to your latest messages\u2026": "", + "Authentication methods saved!": "身份验证方式已保存", + "Author": "发起人", + "Authorization methods": "授权方式", + "Base URL": "基本RUL", + "Bot": "机器人", + "Bot list": "机器人列表", + "Bot type": "机器人类型", + "Bringing you to your latest messages\u2026": "前往最新消息", "By deactivating <>, they will be logged out immediately.": "去激活用户后 <>, 这些用户会立即退出登录。", - "By deactivating your account, you will be logged out immediately.": "", + "By deactivating your account, you will be logged out immediately.": "停用你的账户，你即将被退出登录。", "Cancel": "取消", - "Change": "", - "Change email": "", + "Change": "更改", + "Change email": "更改电子邮件", "Change later messages to this topic": "修改后续消息到该话题", - "Change notification settings for individual streams on your Streams page.": "", + "Change notification settings for individual streams on your Streams page.": "可以在频道订阅页面进行提醒设置。", "Change only this message topic": "仅修改该消息到该话题", - "Change password": "", + "Change password": "更改密码", "Change previous and following messages to this topic": "修改前后消息到该话题", - "Change stream privacy": "", - "Changing email addresses has been disabled by your Zulip organization administrators. Contact an administrator for help.": "", - "Changing your name has been disabled by your Zulip organization administrators. Contact an administrator for help.": "", + "Change stream privacy": "更改频道隐私", + "Changing email addresses has been disabled by your Zulip organization administrators. Contact an administrator for help.": "更改邮件地址相关设置已被你所在的Zulip社区的管理员所禁止，详情请咨询管理员。", + "Changing your name has been disabled by your Zulip organization administrators. Contact an administrator for help.": "更改你的名字相关设置已被你所在的Zulip社区管理员所禁止，详情请咨询管理员。", "Check all": "选择所有", "Choose custom color": "选择自定义颜色", "Clear avatar": "清除头像", - "Clear emoji image": "", - "Click here": "", + "Clear emoji image": "清除表情图像", + "Click here": "点击这里", "Close": "关闭", "Collapse": "折叠", "Compose a message to stream __stream.name__": "发消息到频道"__stream.name__"", - "Configure regular expression patterns that will be automatically linkified when used in Zulip message bodies or topics. For example to automatically linkify commit IDs and issue numbers (e.g. #123) to the corresponding items in a GitHub project, you could use the following:": "", - "Configure the authentication methods for your organization.": "", - "Configure the default streams new users are subscribed to when joining your organization.": "", + "Configure regular expression patterns that will be automatically linkified when used in Zulip message bodies or topics. For example to automatically linkify commit IDs and issue numbers (e.g. #123) to the corresponding items in a GitHub project, you could use the following:": "配置在Zulip消息体或主题中使用时将自动链接至正则表达式模式。 例如，要将提交ID和issue号码(例如＃123)自动链接到GitHub项目中的相应项目，可以使用以下内容：", + "Configure the authentication methods for your organization.": "为你的组织配置身份验证方式。", + "Configure the default streams new users are subscribed to when joining your organization.": "设置新用户在加入是默认订阅的频道", "Confirm password": "确认密码", - "Cookie Bot": "", - "Copied!": "", - "Copy and close": "", - "Copy from stream": "", - "Copy link to conversation": "", - "Could not add user to this stream": "", + "Cookie Bot": "Cookie Bot", + "Copied!": "复制", + "Copy and close": "复制并关闭", + "Copy from stream": "从频道复制", + "Copy link to conversation": "复制链接到回话", + "Could not add user to this stream": "不能将用户添加到这个频道", "Create": "创建", - "Create bot": "", + "Create bot": "已创建的机器人", "Create new stream": "创建新频道", "Create stream": "创建频道", "Current password": "当前密码", "Custom emoji added!": "添加表情成功！", - "Custom filter added!": "", + "Custom filter added!": "自定义过滤器添加成功！", "Customize avatar": "自定义头像", - "Date uploaded": "", + "Date uploaded": "上传日期", "Deactivate": "禁用", - "Deactivate account": "", + "Deactivate account": "关闭账户", "Deactivate now": "禁用", - "Deactivate stream": "", - "Deactivate your account": "", - "Deactivated users": "", - "Default language": "", + "Deactivate stream": "禁用频道", + "Deactivate your account": "关闭你的账户", + "Deactivated users": "不活动成员", + "Default language": "默认语言", "Default language changed!": "默认语言已更新！", - "Default streams": "", - "Delete alert word": "", - "Delete avatar": "", + "Default streams": "默认频道", + "Delete alert word": "删除提示信息", + "Delete avatar": "删除头像", "Delete bot": "删除机器人", - "Delete draft": "", - "Delete file": "", - "Delete icon": "", + "Delete draft": "删除草稿", + "Delete file": "删除文件", + "Delete icon": "删除图标", "Delete message": "删除消息", "Delete stream": "删除频道", - "Deleted successfully!": "", + "Deleted successfully!": "删除成功！", "Deleting this stream will immediately unsubscribe everyone, and the stream's content will not be recoverable.": "删除频道会退订该频道的所有用户，并且该频道的所有消息也将无法恢复。", - "Description changed!": "", + "Description changed!": "描述已修改！", "Desktop notifications": "桌面通知", "Digest emails when I'm away": "当我离线时发送摘要邮件", - "Disabled": "", - "Disabled: __- setting_name__": "", - "Display emoji reactions as text (:heart: instead of \":heart:\")": "", - "Display settings": "", + "Disabled": "禁用", + "Disabled: __- setting_name__": "禁用: __- setting_name__", + "Display emoji reactions as text (:heart: instead of \":heart:\")": "表情符号显示为文本 (:heart: instead of \":heart:\")", + "Display settings": "显示设置", "Do you want to skip to your latest messages?": "是否跳过这些消息？（选择“是”将清除所有未读消息标记）", - "Domain": "", - "Download .zuliprc": "", - "Download config of all active outgoing webhook bots in Zulip Botserver format.": "", - "Download file": "", - "Download flaskbotrc": "", + "Domain": "域名", + "Download .zuliprc": "下载 .zuliprc", + "Download config of all active outgoing webhook bots in Zulip Botserver format.": "以Zulip Botserver格式下载所有活动的外发webhook机器人的配置。", + "Download file": "下载文件", + "Download flaskbotrc": "下载 flaskbotrc", "Drafts": "草稿", "EDITED": "有修改", "Edit": "编辑", "Edit bot": "编辑机器人", - "Edit user": "", - "Edited (__last_edit_timestr__)": "", + "Edit user": "编辑用户", + "Edited (__last_edit_timestr__)": "启用 (__last_edit_timestr__)", "Email": "邮箱", "Email address": "邮箱地址", "Email notifications when offline": "离线时邮件通知", "Emoji name": "表情名称", - "Emoji reactions will appear as __text_or_images__!": "", - "Emoji settings": "", - "Emoji style": "", - "Emojiset changed successfully!!": "", + "Emoji reactions will appear as __text_or_images__!": "表情映射与 __text_or_images__!", + "Emoji settings": "表情设置", + "Emoji style": "表情风格", + "Emojiset changed successfully!!": "置表情更改成功", "Enable desktop notifications for new streams": "为新的频道开启桌面通知", - "Enable message edit history": "", - "Enabled": "", - "Enabled: __- setting_name__": "", - "Error adding alert word!": "", + "Enable message edit history": "启用消息编辑历史", + "Enabled": "启用", + "Enabled: __- setting_name__": "启用: __- setting_name__", + "Error adding alert word!": "添加提示信息错误！", "Error adding subscription": "订阅时发生错误", - "Error changing emojiset.": "", + "Error changing emojiset.": "更改表情遇到错误", "Error changing settings": "修改设置时发生错误", "Error checking subscription": "检查订阅关系时发生错误", "Error creating stream": "创建频道时发生错误", - "Error deactivating account": "", - "Error deleting message.": "", - "Error fetching message edit history": "", - "Error getting API key": "获取API码时发生错误", + "Error deactivating account": "关闭账户错误。", + "Error deleting message.": "删除信息遇到错误", + "Error fetching message edit history": "获取消息编辑记录错误", + "Error getting API key": "获取 API Key 时发生错误", "Error listing users or bots": "显示机器人或者用户信息发生错误", - "Error removing alert word!": "", + "Error removing alert word!": "提示信息移除错误！", "Error removing subscription": "退订时发生错误", - "Error removing user from this stream": "", + "Error removing user from this stream": "从频道移除用户时出现错误", "Error renaming stream": "重命名频道时发生错误", - "Error saving edit": "", + "Error saving edit": "保存更改发生了错误", "Error updating default language setting": "修改默认语言时发生错误", - "Error updating emoji appearance setting": "", - "Error updating high contrast setting": "", + "Error updating emoji appearance setting": "表情符号更新设置错误", + "Error updating high contrast setting": "更新高对比度设置时出错", "Error updating the stream description": "修改频道描述时发生错误", "Error updating time format setting": "修改时间格式时发生错误", - "Error updating time zone": "", + "Error updating time zone": "更改时区时发生错误", "Error updating user list placement setting": "修改用户列表设置时发生错误", - "Error updating: __- setting_name__": "", + "Error updating: __- setting_name__": "错误的更改: __- setting_name__", "Failed": "失败", - "Failed to change notifications stream!": "", - "Failed to generate preview": "", + "Failed to change notifications stream!": "更改频道通知失败！", + "Failed to generate preview": "无法生成预览", "Failed!": "失败", - "Features for the brave. Labs features may change, break, or disappear at any time.": "", - "File": "", - "File type is not supported.": "", - "File upload is not yet available for your browser.": "", + "Features for the brave. Labs features may change, break, or disappear at any time.": "勇敢的选择，实验室功能随时会发生更改，服务终端，或者不可用。", + "File": "文件", + "File type is not supported.": "文件类型不支持。", + "File upload is not yet available for your browser.": "你的浏览器不支持上传文件。", "Filter": "过滤器", - "Filter bots": "", - "Filter deactivated users": "", - "Filter settings": "", - "Filter streams": "", - "Filter users": "", - "For more information on public/private streams, check out our docs.": "", + "Filter bots": "过滤机器人", + "Filter deactivated users": "过滤停用的用户", + "Filter settings": "过滤器设置", + "Filter streams": "过滤频道", + "Filter users": "过滤用户", + "First time? Read our guidelines for creating and naming streams.": "", + "For more information on public/private streams, check out our docs.": "查看更多有关于公开频道和隐私频道的信息，请点击这里查看我们的文档", "Forgotten it?": "忘记了？", "Formatting": "格式化", "Full name": "名称", - "Generate new API key": "生成新的API码", - "Generic bot": "", - "Get API key": "获取API码", - "Go back": "", - "Got it!": "", - "High contrast mode": "", - "High contrast mode __enabled_or_disabled__!": "", + "Generate new API key": "生成新的 API Key", + "Generic bot": "通用机器人", + "Get API key": "获取API Key", + "Go back": "返回上一层", + "Got it!": "了解了！", + "High contrast mode": "高对比度模式", + "High contrast mode __enabled_or_disabled__!": "高对比度模式__enabled_or_disabled__！", "Home": "主页", "I want:": "开启：", - "If checked, image previews will be shown.": "", - "If checked, only administrators may add new emoji.": "", + "If checked, image previews will be shown.": "如果选中，将显示图像预览。", + "If checked, only administrators may add new emoji.": "如果选中，只有系统管理员可以添加新的表情符号。", "If checked, only administrators may create new streams.": "如果勾选，则仅有管理员可以创建新频道。", "If checked, only administrators may invite new users.": "如果勾选，则只有管理员可以邀请新用户", - "If checked, only users with an e-mail address ending in these domains will be able to join the organization.": "", - "If checked, previews of linked websites will be shown.": "", - "If checked, topics are required.": "", + "If checked, only users with an e-mail address ending in these domains will be able to join the organization.": "如果选中，只有在这些域名中具有电子邮件地址的用户才能加入该社群。", + "If checked, previews of linked websites will be shown.": "如果选中，将显示链接网站的预览。", + "If checked, topics are required.": "如果选中，主题将为必须、", "If checked, users can edit the content and topics of their old messages.": "如果勾选，则用户可以编辑历史消息的话题与内容。", "If checked, users must be invited in order to join your organization.": "如果勾选，用户必须邀请才能加入您的社区。", - "If checked, users will be able view message edit history.": "", - "If checked, users will be unable to change their email address.": "", - "If checked, users will be unable to change their name.": "", + "If checked, users will be able view message edit history.": "如果选中，用户将能够查看消息编辑历史记录。", + "If checked, users will be unable to change their email address.": "如果选中，用户将无法更改其电子邮件地址。", + "If checked, users will be unable to change their name.": "如果选中，用户将无法更改其名称。", "If non-zero, users can edit their message for this many minutes after it is sent. If zero, users can edit all their past messages.": "如果设置为非0值，则用户只能对指定时间内的消息进行编辑；如果设置为0，则用户可以编辑所有历史消息。", "Image": "图片", - "Inactive bots": "", - "Include content of private messages in desktop notifications": "", - "Incoming webhook": "", - "Incoming webhooks can only send messages.": "", + "Inactive bots": "无效的机器人", + "Include content of private messages in desktop notifications": "在桌面通知中包含私人消息的内容", + "Incoming webhook": "传入的webhook", + "Incoming webhooks can only send messages.": "传入的webhooks只能发送消息。", "It's been a while! Since you were last here, you received __unread_count__ new messages.": "好久不见！您有__unread_count__条未读消息", - "Joining the organization": "", + "Joining the organization": "加入这个社群", "Keyboard shortcuts": "快捷键", - "Language & notifications": "", - "Language settings": "", - "Large number of subscribers": "", - "Last active": "", - "Last seen __hours__ hours ago": "", - "Last seen __minutes__ minutes ago": "", - "Last seen an hour ago": "", - "Last seen just now": "", - "Last seen on __last_active__": "", - "Last seen on __last_active_date__": "", - "Last seen yesterday": "", - "Local time": "", - "Looking for our Integrations or API documentation?": "", + "Language & notifications": "语言 & 通知", + "Language settings": "语言设置", + "Large number of subscribers": "大批用户", + "Last active": "最后活动时间", + "Last seen __hours__ hours ago": "最后登录在 __hours__ hours 之前", + "Last seen __minutes__ minutes ago": "最后登录在 __minutes__ minutes 之前", + "Last seen an hour ago": "最后登录在一小时前", + "Last seen just now": "最后登录：刚刚", + "Last seen on __last_active__": "最后一次登录 __last_active__", + "Last seen on __last_active_date__": "最后一次登录的时间 __last_active_date__", + "Last seen yesterday": "最后登录在昨天", + "Local time": "本地时间", + "Looking for our Integrations or API documentation?": "看看我们的模块集成库或者API文档？", "Make admin": "设为管理员", - "Make stream invite-only": "", + "Make stream invite-only": "只允许邀请模式的频道", "Make stream public": "设置为公开频道", "Make this message take up less space on the screen": "使得该消息占用较少的屏幕空间", - "Manage organization": "", + "Manage organization": "管理社区", "Mark all messages in __stream.name__ as read": "标记频道"__stream.name__"中的所有消息为已读", "Mark all messages in __topic_name__ as read": "标记话题"__topic_name__"中的所有消息为已读", - "Mentioned in": "", - "Message actions": "", + "Mentioned in": "提到", + "Message actions": "消息动作", "Message edit limit in minutes (0 for no limit)": "消息编辑时限（分钟，0表示不限制）", "Message editing": "消息编辑", - "Message feed": "", + "Message feed": "信息订阅", "Message formatting": "消息语法格式", "Message sent when you were not subscribed": "在您订阅前发送的消息", - "Message successfully edited!": "", - "Messages older than the configured number of days will be automatically deleted": "", - "Messages retention period in days (blank means messages are retained forever)": "", - "Method": "", - "Mobile push notifications": "", - "Mobile push notifications always (even when online)": "", + "Message successfully edited!": "消息编辑成功！", + "Messages older than the configured number of days will be automatically deleted": "超过配置天数的信息将被自动消除。", + "Messages retention period in days (blank means messages are retained forever)": "消息保留期在几天(空白意味着消息永远保留)", + "Method": "方法", + "Mobile push notifications": "推送移动通知", + "Mobile push notifications always (even when online)": "总是推送移动通知(如果在线的话)", "Mobile push notifications when offline": "离线时推送移动终端通知", - "Most stream administration is done on the Streams page.": "", + "Most stream administration is done on the Streams page.": "大多数的频道管理都是在频道页面中。", "Mute stream": "静音频道", "Mute the stream __stream.name__": "频道"__stream.name__"开启免打扰", "Mute the topic __subject__": "话题"__subject__"开启免打扰", "Mute the topic __topic_name__": "话题"__topic_name__"开启免打扰", "Mute topic": "静音主题", "Muted streams don't show up in your home view or generate notifications unless you are mentioned.": "开启免打扰的频道不会出现在主页中，也不会产生通知，除非您被@提醒。", - "Muted topics": "", + "Muted topics": "已静音主题", "Name": "名称", "Name changed!": "名称修改成功！", "Narrow to stream "__display_recipient__"": "筛选频道"__display_recipient__"", @@ -272,241 +274,240 @@ "Narrow to stream __stream.name__": "筛选频道"__stream.name__"", "Narrow to topic __topic_name__": "筛选话题"__topic_name__"", "Narrow to your private messages with __display_reply_to__": "筛选和"__display_reply_to__"的私信", - "Never had one? Forgotten it?": "", - "New alert word": "", + "Never had one? Forgotten it?": "从来没有？还是忘了？", + "New alert word": "新建提示信息", "New password": "新密码", - "New user e-mails now restricted to certain domains!": "", + "New user e-mails now restricted to certain domains!": "现在只限定于特定域名的电子邮件用户！", "New users may have arbitrary e-mails!": "用户可以使用所有邮箱！", "New users may sign up online!": "用户可以在线注册！", "New users must be invited by an admin!": "仅管理员可以邀请新用户！", "New users must be invited by e-mail!": "必须通过邮件邀请新用户", "No": "否", - "No bots match your current filter.": "", - "No changes made.": "", - "No changes to save!": "", - "No default streams match you current filter.": "", - "No description.": "", - "No drafts.": "", - "No more topics.": "", - "No streams match your current filter.": "", - "No users match your current filter.": "", - "None": "", - "Note that any bots that you maintain will be disabled.": "", - "Nothing selected.": "", - "Nothing to preview": "", + "No bots match your current filter.": "没有机器人能匹配当前的过滤器。", + "No changes made.": "未做任何更改。", + "No changes to save!": "没有保存更改！", + "No default streams match you current filter.": "没有默认频道可以匹配你当前的过滤器。", + "No description.": "没有描述信息。", + "No drafts.": "没有草稿", + "No more topics.": "没有更多话题。", + "No streams match your current filter.": "没有匹配到频道在你当前的筛选器中。", + "No users match your current filter.": "没有匹配到用户在你的筛选器中。", + "None": "没有", + "Note that any bots that you maintain will be disabled.": "你维护的机器人也都将被禁用。", + "Nothing to preview": "没有预览", "Notifications": "通知设置", - "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "", - "Notifications stream changed!": "", - "Notifications stream disabled!": "", - "Notifications stream:": "", + "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "当消息到达并且Zulip不在焦点或该消息在屏幕外时，通知则会被触发。", + "Notifications stream changed!": "频道通知已更改！", + "Notifications stream disabled!": "频道通知已禁用！", + "Notifications stream:": "频道通知：", "Old password": "旧密码", - "Only administrators may now add new emoji!": "", - "Only administrators may now create new streams!": "", - "Only admins can invite new users": "", - "Only organization administrators can add custom emoji in this organization.": "", - "Only organization administrators can edit these settings.": "", + "Only administrators may now add new emoji!": "只有管理员才能添加新的表情包！", + "Only administrators may now create new streams!": "只有管理员才能创建新的频道！", + "Only admins can invite new users": "只有管理员可以邀请新用户", + "Only organization administrators can add custom emoji in this organization.": "只有社群管理员才能自定义表情在这个社群中。", + "Only organization administrators can edit these settings.": "只有社群管理员才能编辑这些设置。", "Optional": "可选设置", - "Organization": "", - "Organization avatar": "", - "Organization permissions": "", - "Organization profile": "", + "Organization": "社群", + "Organization avatar": "社群头像", + "Organization permissions": "社群许可", + "Organization profile": "社群资料", "Organization settings": "社区设置", "Other notifications I want:": "开启：", - "Outgoing webhook": "", - "Outgoing webhook message format": "", + "Outgoing webhook": "送出的webhook", + "Outgoing webhook message format": "送出的webhook消息格式", "Owner": "所有者", "Password": "密码", - "Password is too weak": "", - "Password should be at least __length__ characters long": "", - "Pattern": "", + "Password is too weak": "这密码看起来有点弱", + "Password should be at least __length__ characters long": "密码长度至少应该是 __length__ 位", + "Pattern": "模式", "People to add": "添加用户", "Pin stream __stream.name__ to top": "频道”__stream.name__“置顶", - "Pin stream to top of left sidebar": "", - "Please just upload one file.": "", - "Please re-enter your password to confirm your identity.": "", + "Pin stream to top of left sidebar": "钉住频道在左侧栏的顶部", + "Please just upload one file.": "请上传一个文件", + "Please re-enter your password to confirm your identity.": "请重新输入密码以确认你的身份。", "Please specify a stream": "请指定频道", "Please specify a topic": "请指定话题", "Please specify at least one recipient": "请指定至少一个收信人", - "Prevent users from adding custom emoji": "", - "Prevent users from changing their email address": "", - "Prevent users from changing their name": "", - "Prevent users from creating streams": "", - "Previews for linked websites will be shown!": "", - "Previews for linked websites will not be shown!": "", - "Previews of uploaded and linked images will be shown!": "", - "Previews of uploaded and linked images will not be shown!": "", + "Prevent users from adding custom emoji": "阻止用户添加自定义表情符号", + "Prevent users from changing their email address": "阻止用户更改邮件地址", + "Prevent users from changing their name": "防止用户更改名称", + "Prevent users from creating streams": "防止用户创建频道", + "Previews for linked websites will be shown!": "链接网站将被预览显示！", + "Previews for linked websites will not be shown!": "链接网站不会被预览显示！", + "Previews of uploaded and linked images will be shown!": "上传和链接的图像的预览将显示", + "Previews of uploaded and linked images will not be shown!": "上传和链接图像的预览将不被显示！", "Private messages and @-mentions": "私信和@提醒", - "Quote and reply": "", + "Quote and reply": "引用并回复", "Reactivate": "启用", - "Reactivate bot": "", - "Receive audible notifications": "", - "Receive desktop notifications": "", - "Receive push notifications": "", - "Regular expression": "", - "Remove": "", + "Reactivate bot": "重启机器人", + "Receive audible notifications": "接收声音通知", + "Receive desktop notifications": "接收桌面通知", + "Receive push notifications": "接收移动通知", + "Regular expression": "正则表达式", + "Remove": "移除", "Remove admin": "取消管理员", "Remove from default": "取消默认频道", - "Reply mentioning user": "", - "Require topics in stream messages": "", + "Reply mentioning user": "回复提到用户", + "Require topics in stream messages": "频道消息中所需的主题", "Restore draft": "恢复草稿", - "Restrict new users to the following email domains: __domains__": "", - "Retry": "", + "Restrict new users to the following email domains: __domains__": "将新用户限制在以下域名中的电子邮件 : __domains__", + "Retry": "重试", "Save": "保存", "Save changes": "保存修改", "Search": "搜索", - "Search operators": "", - "Search results": "", - "Search subscribers": "", - "Search uploads...": "", + "Search operators": "搜索管理者", + "Search results": "搜索结果", + "Search subscribers": "搜索订阅者", + "Search uploads...": "搜索已上传的文件", "See the rest of this message": "查看其余内容", - "Select default language": "", + "Select default language": "选择默认语言", "Send private message": "发送私有消息", "Settings": "设置", - "Show previews of linked websites": "", - "Show previews of uploaded and linked images": "", - "Show/change your API key": "显示/修改您的API码", - "Size": "", - "Slack compatible": "", - "Sorry, the file was too large.": "", - "Star": "", + "Show previews of linked websites": "显示链接网站的预览", + "Show previews of uploaded and linked images": "显示上传文件链接的图像预览", + "Show/change your API key": "显示/修改您的 API Key", + "Size": "大小", + "Slack compatible": "高度兼容", + "Sorry, the file was too large.": "对不起，文件太大了。", + "Star": "星标", "Stream": "频道", "Stream accessibility": "频道权限", "Stream color": "频道颜色", - "Stream creation": "", - "Stream description": "", - "Stream description (optional)": "", + "Stream creation": "频道创建", + "Stream description": "频道描述", + "Stream description (optional)": "频道描述(可选)", "Stream membership": "频道用户", "Stream messages": "频道消息", "Stream name": "频道名称", "Stream settings": "频道设置", "Streams": "频道", - "Streams & custom emoji": "", + "Streams & custom emoji": "频道 & 自定义表情", "Subscribe": "订阅", - "Subscribe to __stream__": "", + "Subscribe to __stream__": "订阅 __stream__", "Subscribed": "已订阅", - "Subscribers": "", - "The email body will become the Zulip message": "", - "The email subject will become the Zulip topic": "", + "Subscribers": "订阅者", + "The email body will become the Zulip message": "电子邮件正文将成为Zulip消息", + "The email subject will become the Zulip topic": "电子邮件正文将成为Zulip话题", "The email will be forwarded to this stream": "邮件将会转发到这个频道中", - "The recipient __recipient__ is not valid": "", - "The recipients __recipients__ are not valid": "", + "The recipient __recipient__ is not valid": "这个接收者 __recipient__ 是无效的", + "The recipients __recipients__ are not valid": "收件人__recipients__是无效的", "The stream description has been updated!": "频道描述信息已更新", "The stream has been renamed!": "频道重命名成功！", - "The stream to which new stream notifications go to.": "", + "The stream to which new stream notifications go to.": "新流通知发送到的频道。", "Their password will be cleared from our systems, and any bots they maintain will be disabled.": "这些用户的密码会被从系统中清除，他们的机器人用户也会被关闭。", "This is a public stream. Anybody in your organization can join.": "这是一个 公开的频道。社区中的所有用户都可以订阅。", "This is an invite-only stream. Only people who have been invited can access its content, but any member of the stream can invite others.": "这是一个 私有频道。仅有邀请的用户可以对该频道进行访问，该频道的用户也可以邀请其它用户。", "This is an invite-only stream": "该频道需要邀请才能加入", - "This organization is configured to restrict editing of message content to __minutes_to_edit__ minutes after it is sent.": "", - "This stream is currently a public stream which means anyone in the organization can join it. Making it private will mean that only the invited members can join and access its content. Members of the stream can invite others.": "", - "This stream is currently an invite-only stream which means only invited members can join and access its content. Making it public will make it possible for anyone in your organization to join and access it.": "", - "Time settings": "", - "Time will now be displayed in the __format__-hour format!": "", - "Time zone": "", - "Time's up!": "", + "This organization is configured to restrict editing of message content to __minutes_to_edit__ minutes after it is sent.": "这个社群组织已限制讯息发送间隔，请与 __minutes_to_edit__ 分钟后再发。", + "This stream is currently a public stream which means anyone in the organization can join it. Making it private will mean that only the invited members can join and access its content. Members of the stream can invite others.": "当前的频道是公开频道这意味着社群里的任何都人可以加入它。私有化频道意味着只有内部成员的邀请才能够加入它。", + "This stream is currently an invite-only stream which means only invited members can join and access its content. Making it public will make it possible for anyone in your organization to join and access it.": "当前的频道是只有邀请才能加入的频道这意味着是有频道内的成员只有邀请才能有新成员加入，公开化将允许社群内的任何人都可以加入访问它。", + "Time settings": "时间设置", + "Time will now be displayed in the __format__-hour format!": "时间现在将以__format __小时格式显示！", + "Time zone": "时区", + "Time's up!": "时间到了！", "Today": "今日", - "Toggle subscription": "", + "Toggle subscription": "触发订阅", "Topic": "话题", - "Topic editing only": "", - "Topics are not required in messages to streams!": "", - "Topics are required in messages to streams!": "", - "Try again": "", - "UI Settings": "", - "URL format string": "", + "Topic editing only": "只能主题编辑", + "Topics are not required in messages to streams!": "频道中不需要信息主题！", + "Topics are required in messages to streams!": "在讯息频道中需要主题", + "Try again": "再试一次", + "UI Settings": "UI设置", + "URL format string": "URL格式", "Un-collapse": "展开", "Unable to subscribe user": "不能订阅用户", - "Unable to upload that many files at once.": "", + "Unable to upload that many files at once.": "无法一次上传这么多的文件。", "Uncheck all": "全部不选", - "Unknown": "", + "Unknown": "未知", "Unless I say otherwise for a particular stream, I want:": "如果没有对频道作单独配置，则开启：", "Unmute the stream __stream.name__": "频道"__stream.name__"关闭免打扰", "Unmute the topic __subject__": "话题"__subject__"取消免打扰", "Unmute the topic __topic_name__": "话题"__topic_name__"关闭免打扰", "Unpin stream __stream.name__ from top": "取消频道\"__stream.name__\"置顶", - "Unstar": "", + "Unstar": "取消星标", "Unsubscribe": "退订", - "Unsubscribe from __stream__": "", - "Update successful: Subdomains allowed for __domain__": "", - "Update successful: Subdomains no longer allowed for __domain__": "", - "Updated settings! You will need to reload for these changes to take effect.": "", - "Updated successfully!": "", + "Unsubscribe from __stream__": "退订频道 __stream__", + "Update successful: Subdomains allowed for __domain__": "更新成功：允许新的域名于__domain__", + "Update successful: Subdomains no longer allowed for __domain__": "更新成功：不在允许这个域名 __domain__", + "Updated settings! You will need to reload for these changes to take effect.": "设置已更新！ 您需要刷新页面才能使这些更改生效。", + "Updated successfully!": "更新成功！", "Upload avatar": "上传头像", - "Upload emoji": "", - "Upload icon": "", - "Upload new avatar": "", - "Upload new icon": "", - "Upload would exceed your maximum quota. You can delete old attachments to free up space.": "", - "Uploaded files": "", - "Uploading icon.": "", - "Uploading\u2026": "", - "User already subscribed": "", - "User avatar": "", - "User identity": "", + "Upload emoji": "上传表情", + "Upload icon": "上传图标", + "Upload new avatar": "上传一个新头像", + "Upload new icon": "上传新图标", + "Upload would exceed your maximum quota. You can delete old attachments to free up space.": "上传将超过您的最大配额。 您可以删除旧的附件以增加剩余空间。", + "Uploaded files": "已上传文件", + "Uploading icon.": "图标上传中", + "Uploading\u2026": "上传", + "User already subscribed": "用户已经订阅", + "User avatar": "用户头像", + "User identity": "用户标识", "User invited successfully.": "邀请用户成功。", - "User is already not subscribed": "", - "User list on left sidebar in narrow windows": "", + "User is already not subscribed": "用于没有订阅", + "User list on left sidebar in narrow windows": "窗口右侧变懒的用户列表", "User list will appear on the __side__ hand side! You will need to reload the window for your changes to take effect.": "在__side__侧显示用户列表！需要重新加载页面生效", - "User settings": "", + "User settings": "用户设置", "Username": "用户名", - "Users can edit their messages": "", + "Users can edit their messages": "用户可以编辑他们的信息", "Users can no longer edit their past messages!": "不允许用户编辑历史消息！", - "Users can no longer view message edit history!": "", + "Users can no longer view message edit history!": "用户不再可以查看消息编辑历史！", "Users can now edit the content and topics of all their past messages!": "用户现在可以对所有历史消息的内容与话题进行编辑！", - "Users can now edit topics for all their messages, and the content of messages which are less than __num_minutes__ minutes old.": "", - "Users can view message edit history!": "", - "Users cannot change their email!": "", - "Users cannot change their name!": "", - "Users cannot join without an invitation": "", - "Users may now change their email!": "", - "Users may now change their name!": "", - "View edit history": "", - "View file": "", - "View messages sent": "", - "View private messages": "", - "View source": "", - "View source / Edit topic": "", - "View stream": "", - "Waiting period for stream creation (in days)": "", - "Waiting period threshold changed!": "", - "Working\u2026": "", + "Users can now edit topics for all their messages, and the content of messages which are less than __num_minutes__ minutes old.": "用户现在可以编辑所有邮件的主题，以及小于__num_minutes__分钟的邮件内容。", + "Users can view message edit history!": "用户可以查看消息编辑历史", + "Users cannot change their email!": "用户无法更改电子邮件！", + "Users cannot change their name!": "用户不能更改显示名！", + "Users cannot join without an invitation": "用户无法加入邀请", + "Users may now change their email!": "用户现在可以更改自己的电子邮件！", + "Users may now change their name!": "用户现在可以更改自己的显示名！", + "View edit history": "显示编辑历史 ", + "View file": "显示文件", + "View messages sent": "显示已发送消息", + "View private messages": "显示私信", + "View source": "显示源", + "View source / Edit topic": "查看源 / 编辑主题", + "View stream": "显示频道", + "Waiting period for stream creation (in days)": "频道创建间隔(以天为单位)", + "Waiting period threshold changed!": "等待期间阈值已更改", + "Working\u2026": "进行中", "Yes": "是", "Yes, delete this stream": "是的，删除该频道", - "Yes, send": "", - "Yes, subscribe __count__ users!": "", - "Yesterday": "", + "Yes, send": "是的，发送", + "Yes, subscribe __count__ users!": "确定，订阅 __count__ 用户！", + "Yesterday": "昨天", "You and __display_reply_to__": "您和__display_reply_to__", - "You and __recipients__": "", - "You are currently using __total_uploads_size__ of __upload_quota__ upload space.": "", - "You are not subscribed to stream __stream__": "", - "You can send emails to Zulip! Just copy and use this address as an email recipient, and:": "", - "You have no active bots.": "", - "You have no inactive bots.": "", - "You have not muted any topics yet.": "", - "You have not uploaded any files.": "", + "You and __recipients__": "你和 __recipients__", + "You are currently using __total_uploads_size__ of __upload_quota__ upload space.": "您目前使用__upload_quota__上传空间的__total_uploads_size__。", + "You are not subscribed to stream __stream__": "你没有订阅__stream__频道", + "You can send emails to Zulip! Just copy and use this address as an email recipient, and:": "您可以发送电子邮件给Zulip！ 只需复制并使用此地址作为电子邮件收件人，并且：", + "You have no active bots.": "你没有可用的机器人。", + "You have no inactive bots.": "你没有不可用的机器人。", + "You have not muted any topics yet.": "你还没有任何静音的话题", + "You have not uploaded any files.": "目前没有上传任何文件。", "You have nothing to send!": "消息不能为空！", "You need to be running Zephyr mirroring in order to send messages!": "您需要运行Zephyr镜像服务以便发送消息！", - "You subscribed to stream __stream__": "", - "You unsubscribed from stream __stream__": "", - "Your API key:": "您的API码：", - "Your account": "", - "Your bots": "", - "Your organization's description": "", + "You subscribed to stream __stream__": "你订阅了 __stream__ 频道", + "You unsubscribed from stream __stream__": "你取消订阅了 __stream__ 频道", + "Your API key:": "您的 API Key：", + "Your account": "你的账户", + "Your bots": "你的机器人", + "Your organization's description": "社群描述", "Your organization's name": "社区名称", - "Your time zone have been set to __timezone__": "", - "Zulip labs": "", - "[Add or Change]": "", + "Your time zone have been set to __timezone__": "你的时区已经设置为 __timezone__", + "Zulip labs": "Zulip实验室", + "[Add or Change]": "[添加或修改]", "[Condense this message]": "[收起消息]", - "[Disable]": "", + "[Disable]": "[禁用]", "[More...]": "[更多...]", "__lang__ is now the default language! You will need to reload the window for your changes to take effect": "默认语言修改为\"__lang__\"！需要重新加载页面以生效", "__minutes__ min to edit": "__minutes__分钟内完成编辑", "__seconds__ sec to edit": "__seconds__秒内完成编辑", - "__starred_status__ this message": "", + "__starred_status__ this message": "__starred_status__这个消息", "and": "来", - "images": "", - "left": "", + "images": "图像", + "left": "左", "more conversations": "更多会话", "more topics": "更多话题", - "right": "", - "text": "" -} + "right": "右", + "text": "文本" +} \ No newline at end of file