diff --git a/static/locale/bg/LC_MESSAGES/django.po b/static/locale/bg/LC_MESSAGES/django.po index d235acfc6d..ae2def7720 100644 --- a/static/locale/bg/LC_MESSAGES/django.po +++ b/static/locale/bg/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Bulgarian (http://www.transifex.com/zulip/zulip/language/bg/)\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ msgstr "Регистрация" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -446,7 +446,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Сигурни ли сте, че искате да заличите това съобщение?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Отказ" @@ -595,11 +595,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Все още никой не е коментирал това!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -631,48 +631,48 @@ msgstr "Опитай сега." msgid "Invite users to Zulip" msgstr "Поканете потребители в Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Е-поща адреси (по един на ред или разделени с точка/запетая)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Един или повече адреси" -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Потребител(и)" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Членове" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Администратори на Организацията" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Потоци които трябва да използват" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Разпращане покани..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Покана" @@ -738,7 +738,7 @@ msgid "Navigation" msgstr "Навигация" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Търсене на потоци" @@ -940,7 +940,7 @@ msgstr "Абонамент, добавяне, или конфигуриране msgid "Filter streams" msgstr "Филтър потоци" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Всички канали" @@ -1140,14 +1140,14 @@ msgstr "Филтър потребители" msgid "USERS" msgstr "ПОТРЕБИТЕЛИ" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Покани още потребители" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "ГРУПОВИ ЛС-я" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Покани още потребители" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Оператор" @@ -1425,37 +1425,37 @@ msgstr "" msgid "Normal users" msgstr "Нормални потребители" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1470,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1526,81 @@ msgid "Welcome to Zulip!" msgstr "Добре дошли в Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1609,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1668,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1684,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1704,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1723,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1762,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1775,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Възстановяване на парола" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1973,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2189,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2222,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2231,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2247,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2870,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3042,7 +2924,7 @@ msgstr "Описание" msgid "hello" msgstr "" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3009,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3250,7 +3132,7 @@ msgid "Missing topic" msgstr "" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "" @@ -3279,7 +3161,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3499,26 +3381,22 @@ msgstr "" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3902,7 +3780,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3930,43 +3808,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -4490,7 +4368,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "" diff --git a/static/locale/bg/translations.json b/static/locale/bg/translations.json index 33d838ed23..c64dd15bac 100644 --- a/static/locale/bg/translations.json +++ b/static/locale/bg/translations.json @@ -456,6 +456,7 @@ "Search results": "", "Search subscribers": "", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "", "Select date and time": "", "Select default language": "", diff --git a/static/locale/ca/LC_MESSAGES/django.po b/static/locale/ca/LC_MESSAGES/django.po index b0c67f2c7b..ecee96ae27 100644 --- a/static/locale/ca/LC_MESSAGES/django.po +++ b/static/locale/ca/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Catalan (http://www.transifex.com/zulip/zulip/language/ca/)\n" "MIME-Version: 1.0\n" @@ -289,8 +289,8 @@ msgstr "" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -445,7 +445,7 @@ msgid "Are you sure you want to delete this message?" msgstr "" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "" @@ -594,11 +594,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -630,48 +630,48 @@ msgstr "" msgid "Invite users to Zulip" msgstr "" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "" -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Membres" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "" @@ -737,7 +737,7 @@ msgid "Navigation" msgstr "" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "" @@ -939,7 +939,7 @@ msgstr "" msgid "Filter streams" msgstr "" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Tots els canals" @@ -1139,12 +1139,12 @@ msgstr "" msgid "USERS" msgstr "USUARIS" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" +#: templates/zerver/app/right_sidebar.html:28 +msgid "GROUP PMs" msgstr "" -#: templates/zerver/app/right_sidebar.html:31 -msgid "GROUP PMs" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" msgstr "" #: templates/zerver/app/search_operators.html:7 @@ -1424,37 +1424,37 @@ msgstr "" msgid "Normal users" msgstr "Usuaris normals" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1469,48 +1469,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1523,83 +1525,81 @@ msgid "Welcome to Zulip!" msgstr "" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1608,14 +1608,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1667,7 +1667,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1683,7 +1683,7 @@ msgid "Zulip" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1703,14 +1703,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1722,17 +1722,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1762,10 +1761,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1774,178 +1774,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1993,35 +1972,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2241,24 +2188,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2292,14 +2221,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2309,24 +2230,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2343,27 +2246,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2987,7 +2869,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3041,7 +2923,7 @@ msgstr "Descripció" msgid "hello" msgstr "" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3126,120 +3008,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3249,7 +3131,7 @@ msgid "Missing topic" msgstr "" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "" @@ -3278,7 +3160,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3498,26 +3380,22 @@ msgstr "" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3901,7 +3779,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3929,43 +3807,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -4489,7 +4367,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "" diff --git a/static/locale/ca/translations.json b/static/locale/ca/translations.json index 887b8b4821..bb4fb2e2a2 100644 --- a/static/locale/ca/translations.json +++ b/static/locale/ca/translations.json @@ -1,8 +1,8 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", "(This user has been deactivated)": "", - "(away)": "", "(no topic)": "", + "(unavailable)": "", "(you)": "", "1 day": "1 dia", "1 hour": "1 hora", @@ -84,7 +84,8 @@ "Are you sure you want to do this?": "", "Are you sure you want to mention all __count__ people in this stream?": "", "Are you sure you want to resend the invitation to ?": "", - "Are you sure you want to revoke the invitation to ?": "", + "Are you sure you want to revoke the invitation to __email__?": "", + "Are you sure you want to revoke this invitation link created by __referred_by__?": "", "Attach files": "", "Attachment deleted": "", "Audible desktop notifications": "", @@ -116,7 +117,6 @@ "Check all": "", "Choose avatar": "", "Choose custom color": "", - "Clear": "", "Clear avatar": "", "Clear emoji image": "", "Click anywhere on a message to reply.": "", @@ -191,7 +191,7 @@ "Download file": "Descarregar arxiu", "Download zuliprc": "", "Drafts": "", - "Drafts older than __draft_lifetime__ days are automatically removed": "", + "Drafts older than __draft_lifetime__ days are automatically removed.": "", "EDITED": "", "Edit": "Editar", "Edit bot": "", @@ -271,9 +271,9 @@ "Invitation link: __link__": "", "Invitations": "", "Invite": "", + "Invite link": "", "Invite more users": "", "Invited as": "", - "Invited as administrator": "", "Invited at": "", "Invited by": "", "Invites": "", @@ -289,6 +289,7 @@ "Last active": "", "Last modified": "", "Last seen": "", + "Like Organization logo, but for the night theme.": "", "Linkifiers": "", "Local time": "", "Looking for our Integrations or API documentation?": "", @@ -391,6 +392,7 @@ "Organization avatar": "", "Organization description": "", "Organization logo": "", + "Organization logo for night mode": "", "Organization name": "", "Organization permissions": "", "Organization profile": "", @@ -419,6 +421,7 @@ "Preview": "", "Preview profile": "", "Private messages and @-mentions": "", + "Pro tip: You can use 'd' to open your drafts.": "", "Profile": "", "Profile field settings": "", "Quote and reply": "", @@ -442,7 +445,8 @@ "Restrict to a list of domains": "", "Retry": "", "Revoke": "", - "Revoke invitation to ": "", + "Revoke invitation link": "", + "Revoke invitation to __email__": "", "Revoke now": "", "Role": "", "Save": "Guardar", @@ -470,8 +474,8 @@ "Sent! Your message was sent to a topic you have muted.": "", "Sent! Your recent message is outside the current search.": "", "Set a status message": "", - "Set yourself to active": "", - "Set yourself to away": "", + "Set yourself as active": "", + "Set yourself as unavailable": "", "Settings": "", "Setup": "", "Setup two factor authentication": "", @@ -512,6 +516,7 @@ "The email will be forwarded to this stream": "", "The recipient __recipient__ is not valid": "", "The recipients __recipients__ are not valid": "", + "The stream description cannot contain newline characters.": "", "The stream description has been updated!": "", "The stream has been renamed!": "", "Their password will be cleared from our systems, and any bots they maintain will be disabled.": "", @@ -582,13 +587,13 @@ "Video chat provider": "", "View edit history": "", "View file": "", + "View full profile": "", "View messages sent": "", "View private messages": "", "View private messages to myself": "", "View source": "", "View source / Edit topic": "", "View stream": "", - "View user profile": "", "View your profile": "", "Visual desktop notifications": "", "Warning: __stream_name__ is a private stream.": "", @@ -621,6 +626,7 @@ "You have nothing to send!": "", "You must be an organization administrator to create a stream without subscribing.": "", "You need to be running Zephyr mirroring in order to send messages!": "", + "You searched for:": "", "You subscribed to stream __stream__": "", "You unsubscribed from stream __stream__": "", "You're not subscribed to this stream. You will not be notified if other users reply to your message.": "", @@ -642,6 +648,7 @@ "__starred_status__ this message": "", "__wildcard_mention_token__ (Notify stream)": "", "and": "", + "clear": "", "cookie": "", "group private messages with __recipient__": "", "in 1 hour": "", diff --git a/static/locale/cs/LC_MESSAGES/django.po b/static/locale/cs/LC_MESSAGES/django.po index 663b38ed8f..507300695e 100644 --- a/static/locale/cs/LC_MESSAGES/django.po +++ b/static/locale/cs/LC_MESSAGES/django.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" -"Last-Translator: Tim Abbott \n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-19 17:38+0000\n" +"Last-Translator: fri\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" @@ -32,11 +32,11 @@ msgstr "Neplatná organizace" #: analytics/views.py:176 msgid "Public streams" -msgstr "Veřejné streamy" +msgstr "Veřejné kanály" #: analytics/views.py:177 msgid "Private streams" -msgstr "Soukromé streamy" +msgstr "Soukromé kanály" #: analytics/views.py:178 templates/zerver/app/left_sidebar.html:17 #: templates/zerver/app/left_sidebar.html:22 @@ -64,7 +64,7 @@ msgstr "Žádná analytická data nejsou k dispozici. Spojte se, prosím, se spr #: corporate/lib/stripe.py:124 #, python-format msgid "Something went wrong. Please contact %s." -msgstr "Nastala chyba. Kontaktuje, prosím, s %s." +msgstr "Nastala chyba. Spojte se, prosím, s %s." #: corporate/lib/stripe.py:125 msgid "Something went wrong. Please reload the page." @@ -293,8 +293,8 @@ msgstr "Zaregistrovat se" msgid "OR" msgstr "NEBO" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Přihlásit se pomocí %(identity_provider)s" @@ -374,11 +374,11 @@ msgstr "Zahodit koncept" #: templates/zerver/app/compose.html:69 msgid "This is a private stream" -msgstr "Toto je soukromý stream" +msgstr "Toto je soukromý kanál" #: templates/zerver/app/compose.html:71 msgid "Stream" -msgstr "Stream" +msgstr "Kanál" #: templates/zerver/app/compose.html:73 msgid "Topic" @@ -410,7 +410,7 @@ msgstr "Svoji zprávu sepište zde..." #: templates/zerver/app/compose.html:98 msgid "Add emoji" -msgstr "Přidat emoji" +msgstr "Přidat obrázeček" #: templates/zerver/app/compose.html:99 msgid "Formatting" @@ -449,7 +449,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Jste si jistý/á, že chcete smazat tuto zprávu?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Zrušit" @@ -494,7 +494,7 @@ msgid "" " and \n" " compose a new stream message.\n" " " -msgstr "\n Nebo to vemte to do vlastních rukou,\n a \n napište novou zprávu do tohoto streamu.\n " +msgstr "\n Nebo to vemte to do vlastních rukou,\n a \n napište novou zprávu do tohoto kanálu.\n " #: templates/zerver/app/home.html:42 msgid "Nothing's been sent here yet!" @@ -560,7 +560,7 @@ msgstr "Jeden nebo více z těchto uživatelů neexistuje!" #: templates/zerver/app/home.html:111 msgid "" "You aren't subscribed to this stream and nobody has talked about that yet!" -msgstr "Neodebíráte toto vlákno a nikdo o tomhle ještě nemluvil!" +msgstr "Neodebíráte tento kanál a nikdo o tomto ještě nemluvil!" #: templates/zerver/app/home.html:114 msgid "Subscribe" @@ -568,7 +568,7 @@ msgstr "Odebírat" #: templates/zerver/app/home.html:119 msgid "This stream does not exist or is private." -msgstr "Tento stream neexistuje nebo je soukromý." +msgstr "Tento kanál neexistuje nebo je soukromý." #: templates/zerver/app/home.html:122 msgid "You haven't starred anything yet!" @@ -598,11 +598,11 @@ msgid "" " " msgstr "\n Zjistěte víc o zmiňování uživatelů \n zde .\n " -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Nikdo o tom ještě nemluvil!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Zprávy" @@ -634,48 +634,48 @@ msgstr "Zkuste to nyní." msgid "Invite users to Zulip" msgstr "Pozvat uživatele do Zulipu" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "E-maily (jeden na každý řádek nebo oddělené čárkou)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Jeden nebo více e-mailů..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" -msgstr "" +msgstr "nebo" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" -msgstr "" +msgstr "Vytvořit zvací odkaz" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Uživatel(é) budou přidáni jako" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Členové" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Správci organizace" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "Hosté" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" -msgstr "Streamy ke kterým se mají přidat" +msgstr "Kanály, ke kterým se mají přidat" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Odesílání pozvánek..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Pozvat" @@ -697,7 +697,7 @@ msgstr "Odpovědět na zprávu" #: templates/zerver/app/keyboard_shortcuts.html:17 #: templates/zerver/app/keyboard_shortcuts.html:129 msgid "New stream message" -msgstr "Nová zpráva pro stream" +msgstr "Nová zpráva pro kanál" #: templates/zerver/app/keyboard_shortcuts.html:29 #: templates/zerver/app/keyboard_shortcuts.html:250 @@ -741,9 +741,9 @@ msgid "Navigation" msgstr "Navigace" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" -msgstr "Hledat streamy" +msgstr "Hledat kanály" #: templates/zerver/app/keyboard_shortcuts.html:81 #: templates/zerver/app/right_sidebar.html:16 @@ -796,7 +796,7 @@ msgstr "Zúžení" #: templates/zerver/app/keyboard_shortcuts.html:163 msgid "Narrow by stream" -msgstr "Zúžit podle streamu" +msgstr "Zúžit podle kanálu" #: templates/zerver/app/keyboard_shortcuts.html:167 msgid "Narrow by topic" @@ -816,7 +816,7 @@ msgstr "Zúžit na další nepřečtenou soukromou zprávu" #: templates/zerver/app/keyboard_shortcuts.html:183 msgid "Cycle between stream narrows" -msgstr "Procházet mezi jednotlivými zúžení streamů" +msgstr "Procházet mezi jednotlivými zúženími kanálů" #: templates/zerver/app/keyboard_shortcuts.html:187 msgid "Narrow to all unmuted messages" @@ -888,11 +888,11 @@ msgstr "Otevřít nabídku reakcí" #: templates/zerver/app/keyboard_shortcuts.html:290 msgid "Streams settings" -msgstr "Nastavení streamů" +msgstr "Nastavení kanálů" #: templates/zerver/app/keyboard_shortcuts.html:295 msgid "Scroll through streams" -msgstr "Procházet streamy" +msgstr "Procházet kanály" #: templates/zerver/app/keyboard_shortcuts.html:299 msgid "Switch between tabs" @@ -900,15 +900,15 @@ msgstr "Přepínat mezi kartami" #: templates/zerver/app/keyboard_shortcuts.html:303 msgid "View stream messages" -msgstr "Zobrazit zprávy ze streamu" +msgstr "Zobrazit zprávy z kanálu" #: templates/zerver/app/keyboard_shortcuts.html:307 msgid "Subscribe to/unsubscribe from selected stream" -msgstr "Odebírat/Zrušit odběr vybraných streamů" +msgstr "Odebírat/Zrušit odběr vybraných kanálů" #: templates/zerver/app/keyboard_shortcuts.html:311 msgid "Create new stream" -msgstr "Vytvořit nový stream" +msgstr "Vytvořit nový kanál" #: templates/zerver/app/keyboard_shortcuts.html:316 msgid "Detailed keyboard shortcuts documentation" @@ -929,23 +929,23 @@ msgstr "Zprávy s hvězdičkami" #: templates/zerver/app/left_sidebar.html:52 msgid "Subscribed streams" -msgstr "Odebírané streamy" +msgstr "Odebírané kanály" #: templates/zerver/app/left_sidebar.html:52 msgid "STREAMS" -msgstr "STREAMY" +msgstr "KANÁLY" #: templates/zerver/app/left_sidebar.html:53 msgid "Subscribe, add, or configure streams" -msgstr "Odebírat, přidat nebo nastavit streamy" +msgstr "Odebírat, přidat nebo nastavit kanály" #: templates/zerver/app/left_sidebar.html:54 msgid "Filter streams" -msgstr "Filtrovat streamy" +msgstr "Filtrovat kanály" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" -msgstr "Všechny streamy" +msgstr "Všechny kanály" #: templates/zerver/app/lightbox_overlay.html:10 msgid "Pan & Zoom" @@ -1006,17 +1006,17 @@ msgid "" "Zulip needs your permission to\n" " enable desktop notifications.\n" " " -msgstr "Zulip potřebuje vaše svolení pro\n povolení desktopových notifikací.\n " +msgstr "Zulip potřebuje vaše svolení pro\n povolení oznámení na ploše.\n " #: templates/zerver/app/navbar.html:10 msgid "" "We strongly recommend enabling desktop notifications. They help Zulip keep " "your team connected." -msgstr "Velmi doporučujeme povolit desktopové notifikace. Pomohou Zulipu udržet váš tým propojený." +msgstr "Velmi doporučujeme povolit oznámení na ploše. Pomohou Zulipu udržet váš tým propojený." #: templates/zerver/app/navbar.html:12 msgid "Enable notifications" -msgstr "Povolit notifikace" +msgstr "Povolit oznámení" #: templates/zerver/app/navbar.html:14 msgid "Ask me later" @@ -1030,7 +1030,7 @@ msgstr "Nikdy se neptat na tomto počítači" msgid "" "Zulip needs to send email to confirm users' addresses and send " "notifications." -msgstr "Zulip potřebuje odeslat e-mail pro ověření adresy uživatele a posílání notifikací." +msgstr "Zulip potřebuje odeslat e-mail pro ověření adresy uživatele a posílání oznámení." #: templates/zerver/app/navbar.html:25 msgid "See how to configure email." @@ -1038,7 +1038,7 @@ msgstr "Podívejte se jak nastavit e-mail." #: templates/zerver/app/navbar.html:39 msgid "Stream list" -msgstr "Seznam streamů" +msgstr "Seznam kanálů" #: templates/zerver/app/navbar.html:48 templates/zerver/app/navbar.html:68 msgid "Search help" @@ -1063,7 +1063,7 @@ msgstr "Nabídka" #: templates/zerver/app/navbar.html:96 msgid "Manage streams" -msgstr "Spravovat streamy" +msgstr "Spravovat kanály" #: templates/zerver/app/navbar.html:101 #: templates/zerver/app/settings_overlay.html:4 @@ -1143,14 +1143,14 @@ msgstr "Filtrovat uživatele" msgid "USERS" msgstr "UŽIVATELÉ" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Pozvat další uživatele" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "SOUKROMÉ SKUPINOVÉ ZPRÁVY" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Pozvat další uživatele" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operátor" @@ -1161,7 +1161,7 @@ msgstr "Efekt" #: templates/zerver/app/search_operators.html:13 msgid "Narrow to messages on stream" -msgstr "Zúžit na zprávy ve streamu" +msgstr "Zúžit na zprávy v kanálu" #: templates/zerver/app/search_operators.html:17 msgid "Narrow to messages with topic" @@ -1241,7 +1241,7 @@ msgstr "V rámci jednoho dotazu můžete použít jakoukoliv kombinaci těchto v #: templates/zerver/app/search_operators.html:87 msgid "streamname" -msgstr "název-streamu" +msgstr "název-kanálu" #: templates/zerver/app/search_operators.html:88 msgid "user@example.com" @@ -1262,7 +1262,7 @@ msgid "" " containing the keyword\n" " %(placeholder_keyword)s.\n" " " -msgstr "\n Tento dotaz bude hledat zprávy poslané\n %(placeholder_email)s\n do streamu\n %(placeholder_stream)s\n obsahující klíčové slovo\n %(placeholder_keyword)s.\n " +msgstr "\n Tento dotaz bude hledat zprávy poslané\n %(placeholder_email)s\n do kanálu\n %(placeholder_stream)s\n obsahující klíčové slovo\n %(placeholder_keyword)s.\n " #: templates/zerver/app/search_operators.html:111 msgid "Detailed search operators documentation" @@ -1278,7 +1278,7 @@ msgstr "Zobrazit nastavení" #: templates/zerver/app/settings_overlay.html:24 msgid "Notifications" -msgstr "Notifikace" +msgstr "Oznámení" #: templates/zerver/app/settings_overlay.html:29 msgid "Your bots" @@ -1323,11 +1323,11 @@ msgstr "Oprávnění v organizaci" #: templates/zerver/app/settings_overlay.html:70 zerver/models.py:1560 msgid "Custom emoji" -msgstr "Vlastní emoji" +msgstr "Vlastní obrázeček" #: templates/zerver/app/settings_overlay.html:72 msgid "Guest users cannot edit custom emoji." -msgstr "Hosté nemohou editovat vlastní emoji." +msgstr "Hosté nemohou upravovat vlastní obrázeček." #: templates/zerver/app/settings_overlay.html:81 msgid "User groups" @@ -1347,7 +1347,7 @@ msgstr "Vypnutí uživatelé" #: templates/zerver/app/settings_overlay.html:116 msgid "Default streams" -msgstr "Výchozí streamy" +msgstr "Výchozí kanály" #: templates/zerver/app/settings_overlay.html:123 msgid "Linkifiers" @@ -1428,38 +1428,38 @@ msgstr "Hosté" msgid "Normal users" msgstr "Normální uživatelé" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 +#, python-format +msgid "Hi %(user_name)s," +msgstr "Ahoj %(user_name)s," + +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" Hi %(user_name)s,\n" -" " -msgstr "\nAhoj, %(user_name)s." +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" +msgstr "Obdrželi jsme požadavek na změnu vaší e-mailové adresy pro Zulip účet na %(realm_uri)s z %(old_email)s na %(new_email)s. Pro potvrzení této změny klepněte níže:" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 -#, python-format -msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " -msgstr "\n Obdrželi jsme požadavek na změnu e-mailové adresy pro účet v Zulipu na adrese\n %(realm_uri)s z %(old_email)s na %(new_email)s.\n Klikněte níže pro potvrzení:\n " - -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Potvrdit změnu e-mailu" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " -msgstr "\nPokud jste nepožádal/a o tuto změnu tak prosím ihned kontaktujte\n%(support_email)s." +"If you did not request this change, please contact us immediately at %(support_email)s." +msgstr "Pokud jste nepožádal/a o tuto změnu ihned, prosím, kontaktujte%(support_email)s." #: templates/zerver/emails/compiled/confirm_registration.html:10 #: templates/zerver/emails/confirm_registration.source.html:9 @@ -1473,48 +1473,50 @@ msgid "Click the button below to complete registration." msgstr "Klepněte na tlačítko níže pro dokončení registrace." #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Dokončit registraci" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " -msgstr "\n Kontaktujete nás kdykoliv na\n %(support_email)s\n pokud si nebudete vědět rady, budete mít nějaký námět, nebo pokud si jen chcete poklábosit!\n " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" +msgstr "Kontaktujete nás kdykoliv na %(support_email)s pokud si nebudete vědět rady, budete mít nějaký námět, nebo pokud si jen chcete poklábosit! " -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "Do vaší Zulip organizace na adrese %(realm_name)s se můžete přihlásit pomocí odkazu:" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "E-mailová adresa vašeho účtu je %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Pokud se vám nedaří přihlásit, kontaktujte prosím podporu Zulipu odpovědí na tento e-mail." +msgstr "Pokud se vám nedaří přihlásit, spojte se, prosím, s podporou Zulipu odpovědí na tento e-mail." -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1527,83 +1529,81 @@ msgid "Welcome to Zulip!" msgstr "Vítejte v Zulipu!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Vytvořil/a jste novou organizaci v Zulipu %(realm_name)s.\n " +msgid "You've created the new Zulip organization %(realm_name)s." +msgstr "Vytvořili jste novou organizaci na Zulipu %(realm_name)s." -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Připojil/a jste se k Zulip organizaci %(realm_name)s.\n " +msgid "You've joined the Zulip organization %(realm_name)s." +msgstr "Připojil/a jste se k organizaci na Zulipu %(realm_name)s." -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" -msgstr "Detaily vašeho účtu:" +msgstr "Podrobnosti vašeho účtu:" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "URL organizace:" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "Uživatelské jméno:" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "Pro přihlášení použijte váš LDAP účet" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "E-mail:" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " -msgstr "\n (budete je potřebovat pro přihlášení v mobilní a desktopové aplikaci)\n " +"(you'll need these to sign in to the mobile and desktop " +"apps)" +msgstr "(budete je potřebovat pro přihlášení v mobilní a desktopové aplikaci)" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " -msgstr "\n Seznamte se s návodem pro správce, a staňte se přeborníkem v klávesových zkratkách, nebo se pusťte rovnou do práce!\n " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" +msgstr "Seznamte se s návodem pro správce, staňte se přeborníkem v klávesových zkratkách, nebo se pusťte rovnou do práce! " -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " -msgstr "\n Zjistěte více o Zulipu a staňte se přeborníkem\n v klávesových zkratkách, nebo se pusťte rovnou do práce!\n " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" +msgstr "Zjistěte více o Zulipu a staňte se přeborníkem v klávesových zkratkách, nebo se pusťte rovnou do práce!" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Zdravíčko," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1612,15 +1612,15 @@ msgstr "Zdravíčko," msgid "Team Zulip" msgstr "Vývojáři Zulipu" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " -msgstr "\n PS: Sledujte nás na Twitteru,\n dejte nám hvězdičku na GitHubu, nebo\n s námi pokláboste živě na\n komunitním serveru Zulipu!\n " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" +msgstr "PS: Sledujte nás na Twitteru, dejte nám hvězdičku na GitHubu, nebo s námi pokláboste živě na komunitním serveru Zulipu!" #: templates/zerver/emails/compiled/followup_day2.html:9 #: templates/zerver/emails/followup_day2.source.html:8 @@ -1671,7 +1671,7 @@ msgid "Take it for a spin now." msgstr "Pojďme na to." #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1687,7 +1687,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1707,18 +1707,18 @@ msgstr "Ahoj," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " -msgstr "\n %(referrer_full_name)s (%(referrer_email)s)\n vás zve abyste se k němu připojili na Zulipu — nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity.\n " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." +msgstr "%(referrer_full_name)s (%(referrer_email)s) vás zve, abyste se k němu připojili na Zulipu — nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity." -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." -msgstr "Začněte klinutím na tlačítko níže." +msgstr "Začněte klepnutím na tlačítko níže." #: templates/zerver/emails/compiled/invitation_reminder.html:9 #: templates/zerver/emails/invitation_reminder.source.html:8 @@ -1726,17 +1726,16 @@ msgstr "Začněte klinutím na tlačítko níže." msgid "Hi again," msgstr "Ještě jednou ahoj," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " -msgstr "\n Tohle je jen připomínka, že \n %(referrer_name)s (%(referrer_email)s)\n vás zve abyste se k němu připojili na Zulipu — nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity.\n " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." +msgstr "Tohle je jen připomínka, že %(referrer_name)s (%(referrer_email)s) vás zve, abyste se k němu připojili na Zulipu — nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity." -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1757,7 +1756,7 @@ msgid "" "change, please contact us immediately at %(support_email)s." -msgstr "The e-mailová adresa vašeho Zulip účtu byla nedávno změněna na %(new_email)s. Pokud jste tuto změnu neprovedl/a, neprodleně nás kontaktujte na %(support_email)s." +msgstr "E-mailová adresa vašeho Zulip účtu byla nedávno změněna na %(new_email)s. Pokud jste tuto změnu neprovedl/a, neprodleně nás kontaktujte na %(support_email)s." #: templates/zerver/emails/compiled/notify_change_in_email.html:14 #: templates/zerver/emails/notify_change_in_email.source.html:13 @@ -1766,10 +1765,11 @@ msgid "Best," msgstr "S pozdravem," #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "Organizace: %(organization_url)s Čas: %(login_time)s E-mail: %(user_email)s " #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1778,186 +1778,165 @@ msgstr "Organizace: %(organization_url)s Čas: %(login_time)s E-mail: %(user_ema msgid "We noticed a recent login for the following Zulip account." msgstr "Zaznamenali jsme nedávné přihlášení pro následující Zulip účet." -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " -msgstr "\n Organizace: %(realm_uri)s\n " +"Organization: %(realm_uri)s" +msgstr "Organizace: %(realm_uri)s" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " -msgstr "\n E-mail: %(user_email)s\n " +"Email: %(user_email)s" +msgstr "E-mail: %(user_email)s" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " -msgstr "\n Čas: %(login_time)s\n " +msgid "Time: %(login_time)s" +msgstr "Čas: %(login_time)s" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " -msgstr "\n Zařízení: %(device_browser)s na %(device_os)s.\n " +msgid "Device: %(device_browser)s on %(device_os)s." +msgstr "Zařízení: %(device_browser)s na %(device_os)s." -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " -msgstr "\n IP adresa: %(device_ip)s\n " +msgid "IP address: %(device_ip)s" +msgstr "IP adresa: %(device_ip)s" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "Pokud jste to byl/a vy tak je to v pořádku. Nemusíte dělat nic jiného." -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " -msgstr "\n Pokud vám toto přihlášení nic neříká, nebo máte pocit, že váš účet mohl být zkompromitován, prosím\n změňte si heslo\n a/nebo nás neprodleně kontaktujte na adrese %(support_email)s.\n " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." +msgstr "Pokud vám toto přihlášení nic neříká, nebo máte pocit, že váš účet mohl být zkompromitován, prosím změňte si heslo a/nebo nás neprodleně kontaktujte na adrese %(support_email)s." -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "Zulip Security" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" -msgstr "Zrušit odběr notifikací o přihlášení" +msgstr "Zrušit odběr oznámení o přihlášení" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " -msgstr "\n Někdo (nejspíše vy) si vyžádal nové heslo pro Zulip účet %(email)s na adrese %(realm_uri)s.\n " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." +msgstr "Někdo (nejspíše vy) si vyžádal nové heslo pro Zulip účet %(email)s na adrese %(realm_uri)s." -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." -msgstr "Klikněte na tlačítko níže pro změnu vašeho hesla." +msgstr "Klepněte na tlačítko níže pro změnu vašeho hesla." -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Resetovat heslo" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " -msgstr "\n Dříve jste měli účet na %(realm_uri)s, ale byl deaktivován.\n Zkuste kontaktovat správce organizace pro\n opětovnou aktivaci vašeho účtu.\n " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." +msgstr "Dříve jste měli účet na %(realm_uri)s, ale byl vypnut. Zkuste se spojit se správcem organizace pro opětovné zapnutí vašeho účtu." -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " -msgstr "\n V této Zulip organizaci nemáte účet.\n " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." +msgstr "V této Zulip organizaci nemáte účet." -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "Máte aktivní účty v těchto organizacích." -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " -msgstr "\n Můžete se zkusit přihlásit, nebo resetovat vaše heslo v organizacích výše.\n " +"You can try logging in or resetting your password in the organization(s) " +"above." +msgstr "Můžete se zkusit přihlásit, nebo resetovat vaše heslo v organizacích výše." -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " -msgstr "\n Pokud nerozpoznáváte tuto aktivitu, můžete v klidu tento e-mail ignorovat.\n " +"If you do not recognize this activity, you can safely ignore this email." +msgstr "Pokud nerozpoznáváte tuto aktivitu, v klidu, nemusíte si tohoto e-mailu všímat." -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "Drazí bývalí správci %(realm_name)s," + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " -msgstr "\n Drazí bývalí správci %(realm_name)s,\n " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." +msgstr "Jeden z vašich správců požádal o opětovné zapnutí dříve vypnuté Zulip organizace provozované na %(realm_uri)s." -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "\n Jeden z vašich správců požádal o opětovnou aktivaci\n dříve deaktivované Zulip organizace provozované na %(realm_uri)s.\n " - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." -msgstr "Klikněte níže pro opětovnou aktivaci vaší organizace." +msgstr "Klepněte níže pro opětovné zapnutí vaší organizace." -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" -msgstr "Znovu aktivovat organizaci" +msgstr "Znovu zapnout organizaci" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "\n Pokud se to stalo omylem, nemusíte nic dělat a tento odkaz\n za 24 hodin přestane fungovat.\n " - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" -msgstr "" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." +msgstr "Pokud se to stalo omylem, nemusíte nic dělat a tento odkaz za 24 hodin přestane fungovat." #: templates/zerver/emails/confirm_new_email.source.html:13 #, python-format msgid "" "If you did not request this change, please contact us immediately at %(support_email)s." -msgstr "" +msgstr "Pokud jste o to nepožádali, neprodleně se s námi spojte na %(support_email)s." #: templates/zerver/emails/confirm_new_email.subject.txt:1 msgid "Verify your new email address" @@ -1968,7 +1947,7 @@ msgstr "Ověřte vaši novou e-mailovou adresu" msgid "" "If you did not request this change, please contact us immediately at " "<%(support_email)s>." -msgstr "" +msgstr "Pokud jste nedali podnět k této změně, neprodleně se s námi spojte na <%(support_email)s>." #: templates/zerver/emails/confirm_registration.source.html:15 #: templates/zerver/emails/invitation.source.html:18 @@ -1979,15 +1958,15 @@ msgid "" "Contact us any time at %(support_email)s if you run into " "trouble, have any feedback, or just want to chat!" -msgstr "" +msgstr "Spojte se s námi kdykoliv na %(support_email)s. Pokud si nevíte rady, máte nějaký podnět, nebo si jen chcete poklábosit!" #: templates/zerver/emails/confirm_registration.subject.txt:1 msgid "Activate your Zulip account" -msgstr "Aktivujte váš Zulip účet" +msgstr "Zapněte váš Zulip účet" #: templates/zerver/emails/confirm_registration.txt:3 msgid "Click the link below to complete registration." -msgstr "Klikněte na odkaz níže pro dokončení registrace." +msgstr "Klepněte na odkaz níže pro dokončení registrace." #: templates/zerver/emails/confirm_registration.txt:6 #: templates/zerver/emails/invitation.txt:8 @@ -1995,42 +1974,17 @@ msgstr "Klikněte na odkaz níže pro dokončení registrace." msgid "" "Contact us any time at %(support_email)s if you run into trouble,have any " "feedback, or just want to chat!" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" +msgstr "Spojte se s námi kdykoliv na %(support_email)s. Pokud si nevíte rady, máte nějaký podnět, nebo si jen chcete poklábosit!" #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "Vaše stránka pro přihlášení do Zulipu" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the mobile and desktop apps)" -msgstr "" +msgstr " (budete je potřebovat pro přihlášení do mobilní a desktopové aplikace)" #: templates/zerver/emails/followup_day1.source.html:35 #, python-format @@ -2039,7 +1993,7 @@ msgid "" "become a Zulip pro with a few keyboard shortcuts, or dive right in!" -msgstr "" +msgstr "Seznamte se s naším návodem pro správce a staňte se přeborníkem v klávesových zkratkách, nebo se pusťte rovnou do práce! " #: templates/zerver/emails/followup_day1.source.html:37 #, python-format @@ -2047,40 +2001,40 @@ msgid "" "Learn more about Zulip, become a " "pro with a few keyboard " "shortcuts, or dive right in!" -msgstr "" +msgstr "Zjistěte více o Zulipu a staňte se přeborníkem v klávesových zkratkách, nebo se pusťte rovnou do práce! " #: templates/zerver/emails/followup_day1.source.html:47 msgid "" "PS: Follow us on Twitter, star us " "on GitHub, or chat with us " "live on the Zulip community server!" -msgstr "" +msgstr "PS: Sledujte nás na Twitteru, dejte nám hvězdičku na GitHubu, nebo s námi pokláboste živě na komunitním serveru Zulipu! " #: templates/zerver/emails/followup_day1.subject.txt:2 #, python-format msgid "%(realm_name)s on Zulip: Your new organization details" -msgstr "" +msgstr "%(realm_name)s na Zulipu: podrobnosti o vaší nové organizaci" #: templates/zerver/emails/followup_day1.subject.txt:4 #, python-format msgid "%(realm_name)s on Zulip: Your new account details" -msgstr "" +msgstr "%(realm_name)s na Zulipu: podrobnosti o vašem novém účtu" #: templates/zerver/emails/followup_day1.txt:4 #, python-format msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" +msgstr "Vytvořili jste novou organizaci na Zulipu %(realm_name)s." #: templates/zerver/emails/followup_day1.txt:6 #, python-format msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" +msgstr "Připojil/a jste se k organizaci na Zulipu %(realm_name)s." #: templates/zerver/emails/followup_day1.txt:21 msgid "" "(you'll need these to sign in to the mobile and desktop apps " "(https://zulipchat.com/apps))" -msgstr "" +msgstr "(budete je potřebovat pro přihlášení do mobilní a desktopové aplikace (https://zulipchat.com/apps))" #: templates/zerver/emails/followup_day1.txt:25 #, python-format @@ -2088,7 +2042,7 @@ msgid "" "Check out our guide (%(getting_started_link)s) for admins, become a Zulip " "pro with a few keyboard shortcuts (%(keyboard_shortcuts_link)s), or dive " "right in to %(realm_uri)s!" -msgstr "" +msgstr "Seznamte se s naším návodem (%(getting_started_link)s) pro správce, staňte se přeborníkem v klávesových zkratkách (%(keyboard_shortcuts_link)s), nebo jděte rovnou na věc na %(realm_uri)s!" #: templates/zerver/emails/followup_day1.txt:27 #, python-format @@ -2096,14 +2050,14 @@ msgid "" "Learn more (%(getting_started_link)s) about Zulip, become a pro with a few " "keyboard shortcuts (%(keyboard_shortcuts_link)s), or dive right in to " "%(realm_uri)s!" -msgstr "" +msgstr "Zjistěte více (%(getting_started_link)s) o Zulipu, staňte se přeborníkem v klávesových zkratkách (%(keyboard_shortcuts_link)s), nebo jděte rovnou na věc na %(realm_uri)s!" #: templates/zerver/emails/followup_day1.txt:34 msgid "" "PS: Check us out on Twitter (@zulip), star us on GitHub " "(https://github.com/zulip/zulip), or chat with us live on the Zulip " "community server (https://chat.zulip.org)!" -msgstr "" +msgstr "PS: Sledujte nás na Twitteru (@zulip), dejte nám hvězdičku na GitHubu\n(https://github.com/zulip/zulip), nebo si s námi přijďte poklábosit živě na\nkomunitním serveru Zulipu (https://chat.zulip.org)!" #: templates/zerver/emails/followup_day2.source.html:14 msgid "" @@ -2157,7 +2111,7 @@ msgid "" "%(referrer_full_name)s (%(referrer_email)s)wants you to join " "them on Zulip — the team communication tool designed for productivity." -msgstr "" +msgstr "%(referrer_full_name)s (%(referrer_email)s) vás zve, abyste se k němu připojili na Zulipu -- nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity. " #: templates/zerver/emails/invitation.subject.txt:1 #, python-format @@ -2169,12 +2123,12 @@ msgstr "%(referrer_full_name)s vás zve do %(referrer_realm_name)s" msgid "" "%(referrer_full_name)s (%(referrer_email)s) wants you to join them on Zulip " "-- the team communication tool designed for productivity." -msgstr "" +msgstr "%(referrer_full_name)s (%(referrer_email)s) vás zve, abyste se k němu připojili na Zulipu -- nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity." #: templates/zerver/emails/invitation.txt:5 #: templates/zerver/emails/invitation_reminder.txt:5 msgid "To get started, click the link below." -msgstr "Začněte klinutím na odkaz níže." +msgstr "Začněte klepnutím na odkaz níže." #: templates/zerver/emails/invitation_reminder.source.html:10 #, python-format @@ -2183,7 +2137,7 @@ msgid "" "href=\"mailto:%(referrer_email)s\">%(referrer_email)s) wants you to join" " them on Zulip — the team communication tool designed for " "productivity." -msgstr "" +msgstr "Tohle je jen připomínka, že %(referrer_name)s (%(referrer_email)s) vás zve, abyste se k němu připojili na Zulipu — nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity." #: templates/zerver/emails/invitation_reminder.subject.txt:1 #, python-format @@ -2196,7 +2150,7 @@ msgid "" "This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) " "wants you to join them on Zulip -- the team communication tool designed for " "productivity." -msgstr "" +msgstr "Tohle je jen připomínka, že %(referrer_name)s (%(referrer_email)s) vás zve, abyste se k němu připojili na Zulipu -- nástroji pro týmovou komunikaci vytvořeném pro zlepšení produktivity." #: templates/zerver/emails/invitation_reminder.txt:10 #: templates/zerver/emails/realm_reactivation.txt:13 @@ -2204,7 +2158,7 @@ msgstr "" msgid "" "Contact us any time at %(support_email)s if you run into trouble, have any " "feedback, or just want to chat!" -msgstr "" +msgstr "Spojte se s námi kdykoliv na %(support_email)s. Pokud si nevíte rady, máte nějaký podnět, nebo si jen chcete poklábosit!" #: templates/zerver/emails/notify_change_in_email.source.html:10 #, python-format @@ -2226,42 +2180,17 @@ msgid "" "The email associated with your Zulip account was recently changed to " "%(new_email)s. If you did not request this change, please contact us " "immediately at <%(support_email)s>." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" +msgstr "E-mailová adresa vašeho Zulip účtu byla nedávno změněna na %(new_email)s. Pokud jste tuto změnu nevyžádal/a, neprodleně nás kontaktujte na <%(support_email)s>." #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" -msgstr "" +msgstr "Organizace: %(realm_uri)s " #: templates/zerver/emails/notify_new_login.source.html:19 #, python-format msgid "Email: %(user_email)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "Čas: %(login_time)s" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "Zařízení: %(device_browser)s na %(device_os)s." - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "IP adresa: %(device_ip)s" +msgstr "E-mail: %(user_email)s" #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format @@ -2270,7 +2199,7 @@ msgid "" "compromised, please reset your password or contact us immediately at %(support_email)s." -msgstr "" +msgstr "Pokud vám toto přihlášení nic neříká, nebo máte pocit, že váš účet mohl být zkompromitován, prosím, změňte si heslo a/nebo se s námi neprodleně spojte na adrese %(support_email)s." #: templates/zerver/emails/notify_new_login.subject.txt:1 #, python-format @@ -2294,15 +2223,7 @@ msgid "" "compromised, please reset your password at " "%(realm_uri)s/accounts/password/reset/ or contact us immediately at " "%(support_email)s." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" +msgstr "Pokud vám toto přihlášení nic neříká, nebo máte pocit, že váš účet mohl být zkompromitován, prosím, změňte si heslo na %(realm_uri)s/accounts/password/reset/ a/nebo se s námi neprodleně spojte na %(support_email)s." #: templates/zerver/emails/password_reset.source.html:19 #, python-format @@ -2311,25 +2232,7 @@ msgid "" " You can contact an organization administrator to reactivate your " "account." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" +msgstr "Dříve jste měli účet na %(realm_uri)s, ale byl vypnut. Zkuste se spojit se správcem organizace pro opětovné zapnutí vašeho účtu. " #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format @@ -2338,39 +2241,18 @@ msgstr "Požadavek na reset hesla pro %(realm_name)s" #: templates/zerver/emails/password_reset.txt:4 msgid "Click the link below to reset your password." -msgstr "Klikněte na odkaz níže pro reset vašeho hesla." +msgstr "Klepněte na odkaz níže pro resetování vašeho hesla." #: templates/zerver/emails/password_reset.txt:8 #, python-format msgid "" "You previously had an account on %(realm_uri)s, but it has been deactivated." " You can contact an organization administrator to reactivate your account." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" +msgstr "Dříve jste měli účet na %(realm_uri)s, ale byl vypnut.\nZkuste se spojit se správcem organizace pro opětovné zapnutí vašeho účtu." #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." -msgstr "Klikněte na odkaz níže pro opětovnou aktivaci vaší organizace." +msgstr "Klepněte na odkaz níže pro opětovné zapnutí vaší organizace." #: templates/zerver/find_account.html:8 msgid "Find your Zulip accounts" @@ -2458,24 +2340,24 @@ msgstr "Desktopová a mobilní aplikace" #: templates/zerver/for-companies.html:19 msgid "The best chat for workplaces" -msgstr "Nejlepší chat pro pracoviště" +msgstr "Nejlepší program na klábosení pro pracoviště" #: templates/zerver/for-open-source.html:18 msgid "The best chat for open source projects" -msgstr "Nejlepší chat pro open source projekty" +msgstr "Nejlepší program na klábosení pro projekty s otevřeným zdrojovým kódem" #: templates/zerver/for-working-groups-and-communities.html:19 msgid "The best chat for working groups and communities" -msgstr "Nejlepší chat pro pracovní skupiny a komunity" +msgstr "Nejlepší program na klábosení pro pracovní skupiny a komunity" #: templates/zerver/hello.html:58 msgid "Streams in Zulip" -msgstr "Streamy v Zulipu" +msgstr "Kanály v Zulipu" #: templates/zerver/hello.html:62 templates/zerver/hello.html:77 #: templates/zerver/hello.html:92 msgid "Streams in Slack" -msgstr "Streamy na Slacku" +msgstr "Kanály na Slacku" #: templates/zerver/hello.html:73 msgid "Topics in Zulip" @@ -2483,7 +2365,7 @@ msgstr "Témata v Zulipu" #: templates/zerver/hello.html:88 msgid "Stream topics in Zulip" -msgstr "Témata streamů v Zulipu" +msgstr "Témata kanálů v Zulipu" #: templates/zerver/hello.html:100 templates/zerver/hello.html:101 #: templates/zerver/hello.html:107 templates/zerver/hello.html:109 @@ -2697,7 +2579,7 @@ msgstr "\n Zulip je open source, takže si\n #: templates/zerver/realm_reactivation.html:9 msgid "Your organization has been successfully reactivated." -msgstr "Vaše organizace byla znovu aktivována." +msgstr "Vaše organizace byla znovu zapnuta." #: templates/zerver/realm_reactivation_link_error.html:9 msgid "The organization reactivation link has expired or is not valid." @@ -2753,7 +2635,7 @@ msgstr "Kratší je lepší než delší." #: templates/zerver/register.html:52 msgid "Organization URL" -msgstr "URL organizace" +msgstr "Adresa organizace" #: templates/zerver/register.html:59 #, python-format @@ -2886,7 +2768,7 @@ msgid "" "To undo this change or review your other subscription settings, please visit" " your Zulip Settings " "page." -msgstr "Pokud chcete tuto změnu vrátit zpět, nebo pokud chcete zkontrolovat nastavení odběrů, běžte na stránku nastevení." +msgstr "Pokud chcete tuto změnu vrátit zpět, nebo pokud chcete zkontrolovat nastavení odběrů, běžte na stránku s nastavením." #: templates/zerver/zulipchat_migration_tos.html:2 msgid "" @@ -2907,19 +2789,19 @@ msgstr "Musí být správcem plateb nebo správcem organizace" #: zerver/decorator.py:225 msgid "Invalid subdomain for push notifications bouncer" -msgstr "Nelatná subdoména pro bouncer push notifikací" +msgstr "Neplatná subdoména pro \"bouncer push\" oznámení" #: zerver/decorator.py:235 msgid "This API is not available to incoming webhook bots." -msgstr "Toto API není dostupné pro roboty využívající příchozí webhooky." +msgstr "Toto API není dostupné pro roboty využívající příchozí \"webhooky\"." #: zerver/decorator.py:245 msgid "This organization has been deactivated" -msgstr "Tato organizace byla deaktivována" +msgstr "Tato organizace byla vypnuta" #: zerver/decorator.py:247 msgid "Account is deactivated" -msgstr "Účet je deaktivován" +msgstr "Účet je vypnut" #: zerver/decorator.py:261 msgid "Account is not associated with this subdomain" @@ -2927,7 +2809,7 @@ msgstr "Účet není spojen s subdoménou" #: zerver/decorator.py:455 zerver/decorator.py:517 msgid "This endpoint does not accept bot requests." -msgstr "Tento endpoint nepřijímá požadavky robotů." +msgstr "Tento \"endpoint\" nepřijímá požadavky robotů." #: zerver/decorator.py:497 msgid "Must be an server administrator" @@ -2935,15 +2817,15 @@ msgstr "Musí být správce serveru" #: zerver/decorator.py:596 msgid "This endpoint requires HTTP basic authentication." -msgstr "Tento endpoint vyžaduje HTTP basic autentizaci." +msgstr "Tento \"endpoint\" vyžaduje HTTP základní autentizaci." #: zerver/decorator.py:599 msgid "Invalid authorization header for basic auth" -msgstr "Neplatná autorizační hlavička pro basic auth" +msgstr "Neplatná autorizační hlavička pro \"basic auth\"" #: zerver/decorator.py:601 msgid "Missing authorization header for basic auth" -msgstr "Chybějící autorizační hlavička pro basic auth" +msgstr "Chybějící autorizační hlavička pro \"basic auth\"" #: zerver/decorator.py:670 msgid "Not logged in" @@ -2951,7 +2833,7 @@ msgstr "Nepřihlášen" #: zerver/decorator.py:681 msgid "Webhook bots can only access webhooks" -msgstr "Webhook roboti můžou používat pouze webhooky" +msgstr "\"Webhook\" roboti můžou používat pouze \"webhooky\"" #: zerver/decorator.py:740 msgid "Access denied" @@ -2982,7 +2864,7 @@ msgstr "Organizace, ke které se pokoušíte pomocí {email} připojit, neexistu #, python-brace-format msgid "" "Please request an invite for {email} from the organization administrator." -msgstr "Vyžádejte si prosím pozvánku pro {email} od správce organizace." +msgstr "Vyžádejte si, prosím, pozvánku pro {email} od správce organizace." #: zerver/forms.py:156 #, python-brace-format @@ -2991,7 +2873,7 @@ msgid "" "to register for accounts in this organization." msgstr "Váš e-mail {email} není součástí ani jedné domény, které jsou pro tuto organizaci povoleny." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Použijte prosím váš skutečný e-mail." @@ -3045,7 +2927,7 @@ msgstr "Popis" msgid "hello" msgstr "ahoj" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3071,47 +2953,47 @@ msgstr "Neplatné ID uživatele {}" #: zerver/lib/actions.py:2034 msgid "Reminders can only be set for streams." -msgstr "Upomínky mohou být nastaveny pouze pro streamy." +msgstr "Upomínky mohou být nastaveny pouze pro kanály." #: zerver/lib/actions.py:2040 zerver/lib/streams.py:113 #: zerver/lib/streams.py:180 #, python-format msgid "Invalid stream name '%s'" -msgstr "Neplatný název streamu '%s'" +msgstr "Neplatný název kanálu '%s'" #: zerver/lib/actions.py:2042 #, python-format msgid "Stream name too long (limit: %s characters)." -msgstr "Název streamu je příliš dlouhý (maximálně %s znaků)." +msgstr "Název kanálu je příliš dlouhý (maximálně %s znaků)." #: zerver/lib/actions.py:2045 #, python-format msgid "Stream name '%s' contains NULL (0x00) characters." -msgstr "Název streamu '%s' obsahuje znaky NULL (0x00)." +msgstr "Název kanálu '%s' obsahuje znaky NULL (0x00)." #: zerver/lib/actions.py:2049 #, python-format msgid "Invalid default stream group name '%s'" -msgstr "Neplatný název výchozí skupiny streamu '%s'" +msgstr "Neplatný název výchozí skupiny kanálu '%s'" #: zerver/lib/actions.py:2051 #, python-format msgid "Default stream group name too long (limit: %s characters)" -msgstr "Název výchozí skupiny streamu je příliš dlouhý (maximálně %s znaků)" +msgstr "Název výchozí skupiny kanálu je příliš dlouhý (nejvíce %s znaků)" #: zerver/lib/actions.py:2055 #, python-format msgid "Default stream group name '%s' contains NULL (0x00) characters." -msgstr "Název výchozí skupiny streamu '%s' obsahuje znaky NULL (0x00)." +msgstr "Název výchozí skupiny kanálu '%s' obsahuje znaky NULL (0x00)." #: zerver/lib/actions.py:2137 msgid "Only organization administrators can send to this stream." -msgstr "Do tohoto streamu mohou přidávat zprávy pouze správci organizace." +msgstr "Do tohoto kanálu mohou přidávat zprávy pouze správci organizace." #: zerver/lib/actions.py:2166 #, python-format msgid "Not authorized to send to stream '%s'" -msgstr "Nejste oprávněn přidávat zprávy do streamu '%s'" +msgstr "Nejste oprávněn přidávat zprávy do kanálu '%s'" #: zerver/lib/actions.py:2210 msgid "Message must not be empty" @@ -3123,127 +3005,127 @@ msgstr "Zpráva nesmí obsahovat null bajty" #: zerver/lib/actions.py:2283 msgid "Widgets: API programmer sent invalid JSON content" -msgstr "Widgety: programátor API odeslal neplatný JSON" +msgstr "\"Widgety\": programátor API odeslal neplatný JSON" #: zerver/lib/actions.py:2287 #, python-format msgid "Widgets: %s" -msgstr "Wdgety: %s" +msgstr "\"Widgety\": %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" -msgstr "Údaje o odběrech nejsou pro tento stream dostupné" +msgstr "Údaje o odběrech nejsou pro tento kanál dostupné" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" -msgstr "Nepodařilo se získat odběratele soukromého stremu" +msgstr "Nepodařilo se získat odběratele soukromého kanálu" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" -msgstr "Neplatná výchozí skupina streamu '%s'" +msgstr "Neplatná výchozí skupina kanálu '%s'" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" -msgstr "'%(stream_name)s' je výchozí stream a nelze ho přidat do '%(group_name)s'" +msgstr "'%(stream_name)s' je výchozí kanál a nelze ho přidat do '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" -msgstr "Výchozí skupina streamu '%(group_name)s' již existuje" +msgstr "Výchozí skupina kanálu '%(group_name)s' již existuje" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" -msgstr "Stream '%(stream_name)s' je již součástí výchozí skupiny '%(group_name)s'" +msgstr "Kanál '%(stream_name)s' je již součástí výchozí skupiny '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" -msgstr "Stream '%(stream_name)s' není součástí výchozí skupiny '%(group_name)s'" +msgstr "Kanál '%(stream_name)s' není součástí výchozí skupiny '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" -msgstr "Tato výchozí skupina streamu je již pojmenována '%s'" +msgstr "Tato výchozí skupina kanálu je již pojmenována '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" -msgstr "Výchozí skupina streamu '%s' již existuje" +msgstr "Výchozí skupina kanálu '%s' již existuje" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "Neplatný příznak: '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Neplatná zpráva/y" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Neplatná adresa." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Mimo vaši doménu." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "E-mailové adresy obsahující + nejsou povoleny." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Již má účet." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." -msgstr "Nemáte dostatek nevyužitých pozvánek. Spojte se prosím s %s, aby vám limit navýšil. Žádné pozvánky nebyly odeslány." +msgstr "Nemáte dostatek nevyužitých pozvánek. Spojte se, prosím, s %s, aby vám jejich omezení navýšil. Žádné pozvánky nebyly odeslány." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Váš účet je zatím příliš čerstvý a odesílání pozvánek jménem této organizace vám pro tuto chvíli není povoleno. Poproste správce organizace, nebo nějakého zkušenějšího uživatele." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Platnost některých e-mailů se nepodařilo ověřit a proto jsme raději žádné pozvánky neposlali." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Nepodařilo se nám pozvat nikoho." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Některé z těchto adres již Zulip používají, takže jsme jim pozvánku znovu neposílali. Odeslali jsme ji ale všem ostatním!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." -msgstr "Chybný mapping pořadí." +msgstr "Chybný \"mapping\" pořadí." -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Pole s id {id} nebylo nalezeno." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Skupina uživatelů '%s' již existuje" @@ -3253,17 +3135,17 @@ msgid "Missing topic" msgstr "Chybějící téma" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Téma nemůže být prázdné" #: zerver/lib/addressee.py:121 msgid "Cannot send to multiple streams" -msgstr "Nelze poslat na více streamů" +msgstr "Nelze poslat na více kanálů" #: zerver/lib/addressee.py:133 msgid "Missing stream" -msgstr "Chybí stream" +msgstr "Chybí kanál" #: zerver/lib/addressee.py:143 msgid "Message must have recipients" @@ -3280,9 +3162,9 @@ msgstr "Neplatná příloha" #: zerver/lib/attachments.py:28 msgid "" "An error occurred while deleting the attachment. Please try again later." -msgstr "Při mazání přílohy se vyskytla chyba. Zkuste to prosím znovu." +msgstr "Při mazání přílohy se vyskytla chyba. Zkuste to, prosím, znovu." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "Zpráva musí mít příjemce!" @@ -3317,39 +3199,39 @@ msgstr "Doména může obsahovat jen malá písmena, čísla, '.' a '-'." #: zerver/lib/emoji.py:53 zerver/views/realm_emoji.py:52 #, python-format msgid "Emoji '%s' does not exist" -msgstr "Emoji '%s' neexistuje" +msgstr "Obrázeček '%s' neexistuje" #: zerver/lib/emoji.py:66 msgid "Invalid custom emoji." -msgstr "Neplatný vlastní emoji." +msgstr "Neplatný vlastní obrázeček." #: zerver/lib/emoji.py:68 msgid "Invalid custom emoji name." -msgstr "Neplatný název vlastního emoji." +msgstr "Neplatný název vlastního obrázečku." #: zerver/lib/emoji.py:70 msgid "This custom emoji has been deactivated." -msgstr "Tento vlastní emoji byl deaktivován." +msgstr "Tento vlastní obrázeček byl vypnut." #: zerver/lib/emoji.py:73 zerver/lib/emoji.py:78 msgid "Invalid emoji code." -msgstr "Neplatný kód emoji." +msgstr "Neplatný kód obrázečku." #: zerver/lib/emoji.py:75 zerver/lib/emoji.py:80 msgid "Invalid emoji name." -msgstr "Neplatný název emoji." +msgstr "Neplatný název obrázečku." #: zerver/lib/emoji.py:83 msgid "Invalid emoji type." -msgstr "Neplatný typ emoji." +msgstr "Neplatný typ obrázečku." #: zerver/lib/emoji.py:107 msgid "Must be an organization administrator or emoji author" -msgstr "Musí být správcem organizace nebo tvůrcem emoji" +msgstr "Musí být správcem organizace nebo tvůrcem obrázečku" #: zerver/lib/emoji.py:112 zerver/models.py:517 msgid "Invalid characters in emoji name" -msgstr "Neplatné znaky v názvu emoji" +msgstr "Neplatné znaky v názvu obrázečku" #: zerver/lib/error_notify.py:151 msgid "Invalid type parameter" @@ -3362,12 +3244,12 @@ msgstr "Nepodařilo se přidělit event queue" #: zerver/lib/exceptions.py:143 #, python-brace-format msgid "Stream '{stream}' does not exist" -msgstr "Stream '{stream}' neexistuje" +msgstr "Kanál '{stream}' neexistuje" #: zerver/lib/exceptions.py:154 #, python-brace-format msgid "Stream with ID '{stream_id}' does not exist" -msgstr "Stream s ID '{stream_id}' neexistuje" +msgstr "Kanál s ID '{stream_id}' neexistuje" #: zerver/lib/exceptions.py:162 msgid "organization administrator" @@ -3380,7 +3262,7 @@ msgstr "uživatel" #: zerver/lib/exceptions.py:166 #, python-brace-format msgid "Cannot deactivate the only {entity}." -msgstr "Nelze deaktivovat jedinou {entity}." +msgstr "Nelze vypnout jedinou {entity}." #: zerver/lib/exceptions.py:177 #, python-brace-format @@ -3405,13 +3287,13 @@ msgstr "Klepněte kamkoli na zprávu pro vytvoření odpovědi" #: zerver/lib/hotspots.py:14 msgid "Catch up on a stream" -msgstr "Začít se streamy" +msgstr "Začít s kanály" #: zerver/lib/hotspots.py:15 msgid "" "Messages sent to a stream are seen by everyone subscribed to that stream. " "Try clicking on one of the stream links below." -msgstr "Zprávy zaslané do streamu jsou viditelné pro všechny jeho odběratele. Zkuste kliknout na některý z odkazů na stremy níže." +msgstr "Zprávy zaslané do kanálu jsou viditelné pro všechny jeho odběratele. Zkuste klepnout na některý z odkazů na kanály níže." #: zerver/lib/hotspots.py:19 msgid "Topics" @@ -3421,11 +3303,11 @@ msgstr "Témata" msgid "" "Every message has a topic. Topics keep conversations easy to follow, and " "make it easy to reply to conversations that start while you are offline." -msgstr "Každá zpráva má téma. Témata udržují konverzaci přehlednou a usnadňují zapojení do konverzací, které začaly když jste zrovna byli offline." +msgstr "Každá zpráva má téma. Témata udržují konverzaci přehlednou a usnadňují zapojení do konverzací, které začaly když jste zrovna nebyli připojeni k internetu." #: zerver/lib/hotspots.py:26 msgid "Go to Settings to configure your notifications and display settings." -msgstr "" +msgstr "Jděte do Nastavení pro nastavení vašich oznámení a nastavení zobrazení." #: zerver/lib/hotspots.py:30 msgid "Compose" @@ -3435,7 +3317,7 @@ msgstr "Sepsat" msgid "" "Click here to start a new conversation. Pick a topic (2-3 words is best), " "and give it a go!" -msgstr "Klikněte zde pro zahájení nové konverzace. Vyberte si téma (nejlepší jsou 2-3 slova) a vyzkoušejte si to!" +msgstr "Klepněte zde pro zahájení nové konverzace. Vyberte si téma (nejlepší jsou 2-3 slova) a vyzkoušejte si to!" #: zerver/lib/integrations.py:32 msgid "Integration frameworks" @@ -3443,7 +3325,7 @@ msgstr "Frameworky integrací" #: zerver/lib/integrations.py:33 msgid "Continuous integration" -msgstr "Continuous integration" +msgstr "Nepřetržitá integrace" #: zerver/lib/integrations.py:34 msgid "Customer support" @@ -3475,11 +3357,11 @@ msgstr "Různé" #: zerver/lib/integrations.py:41 msgid "Monitoring tools" -msgstr "Nástroje pro monitoring" +msgstr "Nástroje pro sledování" #: zerver/lib/integrations.py:42 msgid "Project management" -msgstr "Projektový management" +msgstr "Správa projektu" #: zerver/lib/integrations.py:43 msgid "Productivity" @@ -3502,29 +3384,25 @@ msgstr "Operátor %s není podporován." msgid "Missing content" msgstr "Chybějící obsah" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" -msgstr "" +msgstr "Neplatná možnost GCM pro \"bouncer\": pritority %r" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" -msgstr "" +msgstr "Neplatné možnosti GCM pro \"bouncer\": %s" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token neexistuje" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "Přijato 500 push notifikací od bounceru" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" -msgstr "Chyba bounceru push notifikací: %s" +msgstr "Chyba \"bounceru push\" oznámení: %s" #: zerver/lib/request.py:31 #, python-brace-format @@ -3560,34 +3438,34 @@ msgstr "Prosím zadejte 'stream'." #: zerver/lib/streams.py:17 msgid "Please choose one: 'stream' or 'stream_id'." -msgstr "Zvolte prosím jedno z: 'stream' nebo 'stream_id'." +msgstr "Zvolte, prosím, jedno z: 'stream' nebo 'stream_id'." #: zerver/lib/streams.py:27 zerver/lib/streams.py:88 zerver/lib/streams.py:95 msgid "Invalid stream id" -msgstr "Neplatné ID streamu" +msgstr "Neplatné ID kanálu" #: zerver/lib/streams.py:106 #, python-format msgid "Stream name '%s' is already taken." -msgstr "Název streamu '%s' je již použit." +msgstr "Název kanálu '%s' je již použit." #: zerver/lib/streams.py:263 msgid "User cannot create streams." -msgstr "Uživatel nemůže vytvářet streamy." +msgstr "Uživatel nemůže vytvářet kanály." #: zerver/lib/streams.py:265 #, python-format msgid "Stream(s) (%s) do not exist" -msgstr "Stream(y) (%s) neexistuje(í)" +msgstr "Kanál(y) (%s) neexistuje(í)" #: zerver/lib/streams.py:268 msgid "User cannot create a stream with these settings." -msgstr "Uživatel nemůže vytvářet streamy s tímto nastavením." +msgstr "Uživatel nemůže vytvářet kanály s tímto nastavením." #: zerver/lib/streams.py:285 #, python-format msgid "Default stream group with id '%s' does not exist." -msgstr "Výchozí skupina streamu s ID '%s' neexistuje." +msgstr "Výchozí skupina kanálu s ID '%s' neexistuje." #: zerver/lib/upload.py:118 zerver/lib/upload.py:133 zerver/lib/upload.py:185 msgid "Could not decode image; did you upload an image file?" @@ -3633,7 +3511,7 @@ msgstr "Špatný název nebo uživatelské jméno" #: zerver/lib/users.py:58 msgid "Invalid configuration data!" -msgstr "Neplatná konfigurace!" +msgstr "Neplatné nastavení!" #: zerver/lib/users.py:84 msgid "Invalid bot type" @@ -3662,7 +3540,7 @@ msgstr "Žádný takový uživatel" #: zerver/lib/users.py:179 msgid "User is deactivated" -msgstr "Uživatel je deaktivován" +msgstr "Uživatel je vypnut" #: zerver/lib/validator.py:41 zerver/lib/validator.py:61 #: zerver/lib/validator.py:71 zerver/lib/validator.py:83 @@ -3784,7 +3662,7 @@ msgstr "Neexistující příkaz: %s" #: zerver/middleware.py:284 msgid "Internal server error" -msgstr "Interní chyba serveru" +msgstr "Vnitřní chyba serveru" #: zerver/middleware.py:308 #, python-brace-format @@ -3793,7 +3671,7 @@ msgstr "Chyba CSRF: {reason}" #: zerver/middleware.py:335 msgid "API usage exceeded rate limit" -msgstr "Používání API překročilo rate limit" +msgstr "Používání API překročilo \"rate limit\"" #: zerver/models.py:580 #, python-format @@ -3806,11 +3684,11 @@ msgstr "Neplatný řezězec URL formátu." #: zerver/models.py:1559 msgid "Unicode emoji" -msgstr "Unicode emoji" +msgstr "Unicode obrázeček" #: zerver/models.py:1561 msgid "Zulip extra emoji" -msgstr "Další emoji Zulipu" +msgstr "Další obrázeček Zulipu" #: zerver/models.py:2385 #, python-format @@ -3820,7 +3698,7 @@ msgstr "Neplatné ID uživatele: %d" #: zerver/models.py:2389 #, python-format msgid "User with ID %d is deactivated" -msgstr "Uživatel s ID %d je deaktivován" +msgstr "Uživatel s ID %d je vypnut" #: zerver/models.py:2392 #, python-format @@ -3845,7 +3723,7 @@ msgstr "Dlouhý text" #: zerver/models.py:2438 msgid "Date picker" -msgstr "Výběr datumu" +msgstr "Výběr data" #: zerver/models.py:2439 msgid "Link" @@ -3861,7 +3739,7 @@ msgstr "neznámý operační systém" #: zerver/signals.py:92 msgid "An unknown browser" -msgstr "Neznámý browser" +msgstr "Neznámý prohlížeč" #: zerver/tornado/event_queue.py:516 zerver/tornado/socket.py:131 msgid "Missing 'queue_id' argument" @@ -3882,20 +3760,20 @@ msgstr "Špatné ID fronty událostí: {queue_id}" #: zerver/tornado/socket.py:120 msgid "Unknown or missing session" -msgstr "Neznámá nebo chybějící session" +msgstr "Neznámé nebo chybějící sezení" #: zerver/tornado/socket.py:126 msgid "CSRF token entry missing from request" -msgstr "V requestu chybí CSRF token" +msgstr "V požadavku chybí symbol CSRF" #: zerver/tornado/socket.py:128 msgid "CSRF token does not match that in cookie" -msgstr "CSRF token neodpovídá zánamu v cookie" +msgstr "CSRF symbol neodpovídá zánamu v \"cookie\"" #: zerver/tornado/socket.py:139 #, python-format msgid "You are not the owner of the queue with id '%s'" -msgstr "Nejste vlastník fronty s id '%s'" +msgstr "Nejste vlastník fronty s ID '%s'" #: zerver/tornado/views.py:32 msgid "You are not authorized to access this queue" @@ -3905,7 +3783,7 @@ msgstr "Nemáte oprávnění přistupovat k této frontě" msgid "No REMOTE_USER set." msgstr "Chybějící nastavení REMOTE_USER." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "Neplatný OTP" @@ -3915,61 +3793,61 @@ msgstr "Auth klíč pro tuto subdoménu nebyl nalezen." #: zerver/views/auth.py:236 msgid "No JSON web token passed in request" -msgstr "V requestu chybí JSON web token" +msgstr "V požadavku chybí JSON \"web token\"" #: zerver/views/auth.py:238 msgid "Bad JSON web token" -msgstr "Chybný JSON web token" +msgstr "Chybný JSON \"web token\"" #: zerver/views/auth.py:242 msgid "No user specified in JSON web token claims" -msgstr "V JSON web token claimu chybí info o uživateli" +msgstr "V JSON \"web token claimu\" chybí údaje o uživateli" #: zerver/views/auth.py:245 msgid "No organization specified in JSON web token claims" -msgstr "V JSON web token claimu chybí nastavení organizace" +msgstr "V JSON \"web token claimu\" chybí nastavení organizace" #: zerver/views/auth.py:251 msgid "Wrong subdomain" msgstr "Špatná subdoména" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Vývojové prostředí není zapnuto." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." -msgstr "Tato organizace byla deaktivována." +msgstr "Tato organizace byla vypnuta." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Váš účet byl zakázán." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Tento uživatel není zaregistrován." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Přihlášení heslem je ve vašem týmu vypnuto." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Tento uživatel není zaregistrován; zaregistrujte se pomocí prohlžeče." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Vaše uživatelské jméno nebo heslo nejsou správné." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Neplatná subdoména" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Subdoména je povinná" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID není nastaveno" @@ -3979,7 +3857,7 @@ msgstr "

Neplatná URL.

" #: zerver/views/compatibility.py:77 msgid "User-Agent header missing from request" -msgstr "V requestu chybí hlavička User-Agent" +msgstr "V požadavku chybí hlavička uživatelského agenta (User-Agent)" #: zerver/views/custom_profile_fields.py:35 msgid "Name cannot be blank." @@ -4001,7 +3879,7 @@ msgstr "Pole s tímto názvem již existuje." #: zerver/views/hotspots.py:17 #, python-format msgid "Unknown hotspot: %s" -msgstr "Neznámý hotspot: %s" +msgstr "Neznámý \"hotspot\": %s" #: zerver/views/invite.py:30 msgid "Must be invited as an valid type of user" @@ -4009,15 +3887,15 @@ msgstr "Musí být pozván jako platný typ uživatele" #: zerver/views/invite.py:34 msgid "You must specify at least one email address." -msgstr "Musíte zadat alespoň jeden e-mail." +msgstr "Musíte zadat alespoň jednu adresu elektronické pošty." #: zerver/views/invite.py:36 msgid "You must specify at least one stream for invitees to join." -msgstr "Musíte zadat aspoň jeden stream, ke kterému se mají pozvaní připojit." +msgstr "Musíte zadat aspoň jeden kanál, ke kterému se mají pozvaní připojit." #: zerver/views/invite.py:52 msgid "Stream does not exist with id: {}. No invites were sent." -msgstr "Stream s id {} neexistuje. Žádné pozvánky nebyly odeslány." +msgstr "Kanál s ID {} neexistuje. Žádné pozvánky nebyly odeslány." #: zerver/views/invite.py:80 zerver/views/invite.py:83 #: zerver/views/invite.py:95 zerver/views/invite.py:98 @@ -4026,7 +3904,7 @@ msgstr "Žádné taková pozvánka" #: zerver/views/invite.py:114 msgid "Invalid stream id {}. No invites were sent." -msgstr "Neplatné ID streamu {}. Nebyly odeslány žádné pozvánky." +msgstr "Neplatné ID kanálu {}. Nebyly odeslány žádné pozvánky." #: zerver/views/messages.py:76 #, python-brace-format @@ -4094,7 +3972,7 @@ msgstr "Nemáte oprávnění k upravení této zprávy" #: zerver/views/messages.py:1394 zerver/views/messages.py:1404 msgid "The time limit for editing this message has passed" -msgstr "Časový limit pro úpravu zprávy vypršel" +msgstr "Časová lhůta pro upravení této zprávy vypršela" #: zerver/views/messages.py:1407 msgid "Nothing to change" @@ -4106,7 +3984,7 @@ msgstr "Nemáte oprávnění smazat tuto zprávu" #: zerver/views/messages.py:1474 msgid "The time limit for deleting this message has passed" -msgstr "Časový limit pro smazání zprávy vypršel" +msgstr "Časová lhůta pro smazání této zprávy vypršela" #: zerver/views/messages.py:1485 msgid "Message already deleted" @@ -4158,15 +4036,15 @@ msgstr "Alespoň jedno z následujících musí být uvedeno: emoji_name, emoji_ #: zerver/views/reactions.py:108 msgid "Reaction doesn't exist." -msgstr "Reakce neexistuje." +msgstr "Odpověď neexistuje." #: zerver/views/reactions.py:137 msgid "Reaction already exists" -msgstr "Reakce již existuje" +msgstr "Odpověď již existuje" #: zerver/views/reactions.py:159 msgid "Reaction does not exist" -msgstr "Reakce neexistuje" +msgstr "Odpověď neexistuje" #: zerver/views/realm.py:76 zerver/views/user_settings.py:130 #, python-format @@ -4253,7 +4131,7 @@ msgstr "Musíte nahrát přesně jednu ikonu." #: zerver/views/realm_logo.py:17 msgid "Feature unavailable on your current plan." -msgstr "Funkce není pro váš placený plán k dispozici" +msgstr "Funkce není pro váš placený plán dostupná." #: zerver/views/realm_logo.py:20 msgid "You must upload exactly one logo." @@ -4282,7 +4160,7 @@ msgstr "Neplatná hodnota pro \"op\". Nastavte buď \"add\" nebo \"remove\"." #: zerver/views/streams.py:165 msgid "Stream already has that name!" -msgstr "Stream už se takhle jmenuje!" +msgstr "Kanál už se takto jmenuje!" #: zerver/views/streams.py:194 zerver/views/user_groups.py:74 msgid "Nothing to do. Specify at least one of \"add\" or \"delete\"." @@ -4290,29 +4168,29 @@ msgstr "Nic k provedení. Zadejte aspoň jedno z \"add\" nebo \"delete\"." #: zerver/views/streams.py:236 msgid "This action requires administrative rights" -msgstr "Tato akce vyžaduje oprávnění správce" +msgstr "Tento krok vyžaduje oprávnění správce" #: zerver/views/streams.py:266 #, python-format msgid "" "Hi there! @**%(full_name)s** just subscribed you to the stream " "#**%(stream_name)s**." -msgstr "Ahoj! @**%(full_name)s** vás právě přidal/a do streamu #**%(stream_name)s**." +msgstr "Ahoj! @**%(full_name)s** vás právě přidal/a do kanálu #**%(stream_name)s**." #: zerver/views/streams.py:270 #, python-format msgid "" "Hi there! @**%(full_name)s** just subscribed you to the following streams:" -msgstr "Ahoj! @**%(full_name)s** vás přidal/a do následujících streamů:" +msgstr "Ahoj! @**%(full_name)s** vás přidal/a do následujících kanálů:" #: zerver/views/streams.py:321 #, python-format msgid "Unable to access stream (%s)." -msgstr "Nelze zobrazit stream (%s)." +msgstr "Nelze zobrazit kanál (%s)." #: zerver/views/streams.py:327 msgid "You can only invite other Zephyr mirroring users to private streams." -msgstr "Další uživatele, kteří jsou zrcadlení pomocí Zephyru, můžete zvát pouze do soukromých streamů." +msgstr "Další uživatele, kteří jsou zrcadleni pomocí Zephyru, můžete zvát pouze do soukromých kanálů." #: zerver/views/streams.py:329 msgid "Your account is too new to modify other users' subscriptions." @@ -4321,12 +4199,12 @@ msgstr "Váš účet je příliš nový na to, abyste mohli upravovat odběry da #: zerver/views/streams.py:554 #, python-format msgid "Unknown subscription property: %s" -msgstr "Neznámý atribut odběru: %s" +msgstr "Neznámá vlastnost odběru: %s" #: zerver/views/streams.py:558 #, python-format msgid "Not subscribed to stream id %d" -msgstr "Odběr streamu s id %d není nastaven" +msgstr "Odběr kanálu s ID %d není nastaven" #: zerver/views/submessage.py:31 msgid "Invalid json for submessage" @@ -4403,12 +4281,12 @@ msgstr "Neplatné časové pásmo '%s'" #: zerver/views/user_settings.py:138 #, python-format msgid "Invalid emojiset '%s'" -msgstr "Neplatná sada emoji '%s'" +msgstr "Neplatná sada obrázečků '%s'" #: zerver/views/user_settings.py:175 #, python-format msgid "Invalid notification sound '%s'" -msgstr "Neplatný zvuk notifikací '%s'" +msgstr "Neplatný zvuk oznámení '%s'" #: zerver/views/user_settings.py:188 msgid "You must upload exactly one avatar." @@ -4416,7 +4294,7 @@ msgstr "Musíte nahrát právě jeden obrázek avatara." #: zerver/views/users.py:45 msgid "Cannot deactivate the only organization administrator" -msgstr "Nelze deaktivovat jediného správce organizace" +msgstr "Nelze vypnout jediného správce organizace" #: zerver/views/users.py:97 msgid "Guests cannot be organization administrators" @@ -4432,7 +4310,7 @@ msgstr "Nepodařilo se změnit vlastníka, žádný takový uživatel neexistuje #: zerver/views/users.py:187 msgid "Failed to change owner, user is deactivated" -msgstr "Nepodařilo se změnit vlastníka, uživatel je deaktivován" +msgstr "Nepodařilo se změnit vlastníka, uživatel je vypnut" #: zerver/views/users.py:189 msgid "Failed to change owner, bots can't own other bots" @@ -4440,11 +4318,11 @@ msgstr "Nepodařilo se změnit vlastníka, roboti nemohou vlastnit jiné roboty" #: zerver/views/users.py:284 msgid "Embedded bots are not enabled." -msgstr "Embedovaní roboti nejsou povoleni." +msgstr "Přidaní roboti nejsou povoleni." #: zerver/views/users.py:286 msgid "Invalid embedded bot name." -msgstr "Neplatný název embedovaného robota." +msgstr "Neplatný název přidaného robota." #: zerver/views/users.py:293 msgid "Username already in use" @@ -4487,13 +4365,13 @@ msgstr "V JSONu chybí klíč %s" #: zerver/webhooks/front/view.py:119 msgid "Unknown webhook request" -msgstr "Neznámý webhook request" +msgstr "Neznámý \"webhook request\"" #: zerver/webhooks/groove/view.py:92 msgid "Missing required data" msgstr "Chybí požadované údaje" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Obsah nemůže být prázdný" @@ -4503,7 +4381,7 @@ msgstr "Neplatný JSON vstup" #: zerver/webhooks/pivotal/view.py:178 msgid "Unable to handle Pivotal payload" -msgstr "Nelze obsloužit Pivotal payload" +msgstr "Nelze obsloužit \"Pivotal payload\"" #: zerver/webhooks/slack/view.py:23 msgid "Error: channels_map_to_topics parameter other than 0 or 1" @@ -4515,7 +4393,7 @@ msgstr "Zpráva ze Slacku" #: zerver/webhooks/wordpress/view.py:38 msgid "Unknown WordPress webhook action: " -msgstr "Neznámá akce WordPress webhooku:" +msgstr "Neznámá akce WordPress \"webhooku\":" #: zerver/webhooks/zabbix/view.py:41 msgid "Invalid payload" @@ -4529,7 +4407,7 @@ msgstr "Musí se prokázat platným Zulip server API klíčem" #. error #: zilencer/views.py:35 msgid "Invalid token type" -msgstr "Neplatný typ tokenu" +msgstr "Neplatný typ symbolu" #: zilencer/views.py:58 #, python-format @@ -4539,7 +4417,7 @@ msgstr "%s není platný hostname" #: zilencer/views.py:158 #, python-format msgid "Invalid property %s" -msgstr "Neplatný atribut %s" +msgstr "Neplatná vlastnost %s" #: zilencer/views.py:160 msgid "Data is out of order." diff --git a/static/locale/cs/translations.json b/static/locale/cs/translations.json index ea0c0977af..ce54aed631 100644 --- a/static/locale/cs/translations.json +++ b/static/locale/cs/translations.json @@ -1,6 +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)": "(Tento uživatel byl deaktivován)", + "(This user has been deactivated)": "(Tento uživatel byl vypnut)", "(away)": "(nepřítomen)", "(no topic)": "(žádné téma)", "(you)": "(vy)", @@ -13,12 +13,12 @@ "Private, protected history: must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users": "Soukromá, chráněná historie: pozvánka je nutná; noví členové vidí pouze zprávy zaslané po tom co se připojí; skryto pro uživatele mimo správců", "Private, shared history: must be invited by a member; new members can view complete message history; hidden from non-administrator users": "Soukromá, sdílená historie: pozvánka je nutná; noví členové vidí kompletní historii; skryto pro uživatele mimo správců", "Public: anyone can join; anyone can view complete message history without joining": "Veřejná: každý se může připojit; všichni mohou vidět celou historii zpráv bez připojení", - "

Stream will be announced in #__notifications_stream__.

": "

Stream bude bude oznámen v #__notifications_stream__.

", - "

The stream __stream_name__ does not exist.

Manage your subscriptions on your Streams page.

": "

Stream __stream_name__ neexistuje.

Spravujte své odběry na stránce vašich stremů.

", - "__name__ is not subscribed to this stream. They will not be notified if you mention them.": "__name__ neodebírá tento stream. Pokud jej zmíníte, nebude upozorněn.", - "__name__ is not subscribed to this stream. They will not be notified unless you subscribe them.": "__name__ neodebírá tento stream. Nebude upozorněn pokud jim odběr nenstavíte.", - "A stream needs to have a name": "Stream musí mít název", - "A stream with this name already exists": "Stream s tímto názvem již existuje", + "

Stream will be announced in #__notifications_stream__.

": "

Kanál bude bude oznámen v #__notifications_stream__.

", + "

The stream __stream_name__ does not exist.

Manage your subscriptions on your Streams page.

": "

Kanál __stream_name__ neexistuje.

Spravujte své odběry na stránce vašich kanálů.

", + "__name__ is not subscribed to this stream. They will not be notified if you mention them.": "__name__ neodebírá tento kanál. Pokud jej zmíníte, nebude upozorněn.", + "__name__ is not subscribed to this stream. They will not be notified unless you subscribe them.": "__name__ neodebírá tento kanál. Nebude upozorněn pokud jim odběr nenstavíte.", + "A stream needs to have a name": "Kanál musí mít název", + "A stream with this name already exists": "Kanál s tímto názvem již existuje", "A wide image, replacing the Zulip logo in the upper left corner of the Zulip apps.": "Široký obrázek, který nahradí logo Zulipu v levém horním rohu Zulip aplikací.", "API key": "API klíč", "Action": "Akce", @@ -42,10 +42,10 @@ "Add linkifier": "Přidat generátor odkazů", "Add member...": "Přidat člena...", "Add members of your organization to mentionable user groups.": "Přidat členy organizace do uživatelských skupin, které lze zmínit.", - "Add new default stream": "Přidat nový výchozí stream", + "Add new default stream": "Přidat nový výchozí kanál", "Add profile field": "Přidat pole profilu", "Add question": "Přidat otázku", - "Add stream": "Přidat stream", + "Add stream": "Přidat kanál", "Add task": "Přidat úkol", "Add video call": "Přidat obrazový hovor", "Added successfully!": "Úspěšně přidáno!", @@ -61,7 +61,7 @@ "Alert words allow you to be notified as if you were @-mentioned when certain words or phrases are used in Zulip.": "Sledovaná slova vyvolají notifikaci kdykoliv je někdo použije na Zulipu podobně jako kdybyste byl zmíněn pomocí @.", "All admins, and members with accounts at least 3 days old.": "Všichni správci a členové s účtem starým alespoň 3 dny.", "All admins, and members with accounts at least N days old.": "Všichni správci a členové s účtem starým alespoň N dní.", - "All streams": "Všechny streamy", + "All streams": "Všechny kanály", "Allow message content in missed message emails": "Povolit obsah zpráv v e-mailech o promeškaných zprávách", "Allow message deleting": "Povolit mazání zpráv", "Allow message editing": "Povolit úpravy zpráv", @@ -72,17 +72,17 @@ "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 klíč lze použít pro progamový přístup k Zulip účtu. Kdokoliv, kdo má přístup k vašemu API klíči, může číst vaše zprávy, odesílat zprávy za vás a v zásadě vystupovat na Zulipu vaším jménem. To znamená, že byste měli svůj API klíč držet v bezpečí stejně jako vaše heslo.
Doporučujeme využít roboty a robotické účty (resp. jejich API klíče) pro přístup k API Zulipu pokud úkol vyloženě nevyžaduje přístup k vašemu účtu.", "An hour ago": "Před hodinou", "An unknown error occurred.": "Vyskytla se neznámá chyba", - "Announce stream": "Oznámit stream", + "Announce stream": "Oznámit kanál", "Any member of this organization can add custom emoji.": "Kterýkoliv člen této organizace může přidávat vlastní emoji.", "Any time": "Kdykoli", "Anyone in this organization can add bots": "Každý v této organizaci může přidávat roboty", - "Apply this change to all current stream subscriptions?": "Použít na všechny stávající odběry streamu?", + "Apply this change to all current stream subscriptions?": "Použít na všechny stávající odběry kanálu?", "Are invitations required for joining the organization?": "Je pro připojení k organizaci vyžadována pozvánka?", - "Are you sure you want to create stream '__stream_name__' and subscribe __count__ users to it?": "Jste si jistý, že chcete vytvořit stream '__stream_name__' a přihlásit k jeho odběru __count__ uživatelů?", + "Are you sure you want to create stream '__stream_name__' and subscribe __count__ users to it?": "Jste si jistý, že chcete vytvořit kanál '__stream_name__' a přihlásit k jeho odběru __count__ uživatelů?", "Are you sure you want to delete __group_name__?": "Jste si jistý/á, že chcete smazat __group_name__?", - "Are you sure you want to delete all messages in __topic_name__?": "", + "Are you sure you want to delete all messages in __topic_name__?": "Jste si jistý/á, že chcete smazat všechny zprávy v __topic_name__?", "Are you sure you want to do this?": "Jste si jistý/á, že to chcete udělat?", - "Are you sure you want to mention all __count__ people in this stream?": "Jste si jistý/á, že chcete zmínit všech __count__ lidí v tomto streamu?", + "Are you sure you want to mention all __count__ people in this stream?": "Jste si jistý/á, že chcete zmínit všech __count__ lidí v tomto kanálu?", "Are you sure you want to resend the invitation to ?": "Opravdu chcete znovu poslat pozvánku ?", "Are you sure you want to revoke the invitation to ?": "Opravdu chcete zrušit pozvánku ?", "Attach files": "Připojit soubory", @@ -105,11 +105,11 @@ "Change email": "Změnit e-mail", "Change full name": "Změnit jméno", "Change later messages to this topic": "Nastavit téma pro všechny následující zprávy", - "Change notification settings for individual streams on your Streams page.": "Změnit nastavení notifikací pro jednotlivé streamy na vaší Stránce streamů.", + "Change notification settings for individual streams on your Streams page.": "Změnit nastavení oznámení pro jednotlivé kanály na vaší Stránce kanálů.", "Change only this message topic": "Upravit téma jen pro tuto zprávu", "Change password": "Změnit heslo", "Change previous and following messages to this topic": "Upravit téma všechny předchozí a následující zprávy", - "Change stream permissions for #": "Změnit nastavení oprávnění streamu pro #", + "Change stream permissions for #": "Změnit nastavení oprávnění kanálu pro #", "Change user info and roles": "Změnit uživatelské informace a role", "Changing email addresses has been disabled by your Zulip organization administrators. Contact an administrator for help.": "Úpravy e-mailů byly ve vaší Zulip organizaci správcem zakázány. Kontaktuje správce aby vám pomohl.", "Changing your name has been disabled by your Zulip organization administrators. Contact an administrator for help.": "Úpravy vašeho jména byly ve vaší Zulip organizaci správcem zakázány. Kontaktujte správce aby vám pomohl.", @@ -123,23 +123,23 @@ "Click outside the input box to save. We\\'ll automatically notify anyone that was added or removed.": "Pro uložení klepněte mimo zadávací pole. Automaticky bude upozorněn každý, kdo byl přidán nebo odstraněn.", "Close": "Zavřít", "Collapse": "Sbalit", - "Compose a message to stream __stream.name__": "Vytvořit zprávu pro stream __stream.name__", + "Compose a message to stream __stream.name__": "Vytvořit zprávu pro kanál __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:": "Nastavte regulární výrazy, které budou při shodě v těle zprávy nebo názvu tématu automaticky nahrazeny odkazem. Například pro automatické nahrazení odkazem u ID commitů a issues (např. #123) z GitHubu, byste mohl/a použít následující:", "Configure the authentication methods for your organization.": "Nastavit metody autentizace pro vaší organizaci.", - "Configure the default streams new users are subscribed to when joining your organization.": "Nastavit výchozí streamy, které budou noví uživatele po připojení k vaší organizaci automaticky odebírat.", + "Configure the default streams new users are subscribed to when joining your organization.": "Nastavit výchozí kanály, které budou noví uživatele po připojení k vaší organizaci automaticky odebírat.", "Convert emoticons before sending (:) becomes \ud83d\ude03)": "Převést emotikony před odesláním (z :) bude 😃)", "Cookie Bot": "Cookie robot", "Copied!": "Zkopírováno!", "Copy and close": "Kopírovat a zavřít", - "Copy from stream": "Kopírovat ze streamu", + "Copy from stream": "Kopírovat z kanálu", "Copy link to conversation": "Kopírovat odkaz na konverzaci", "Copy zuliprc": "Kopírovat zuliprc", "Create": "Vytvořit", "Create bot": "Vytvořit robota", - "Create new stream": "Vytvořit nový stream", - "Create stream": "Vytvořit stream", + "Create new stream": "Vytvořit nový kanál", + "Create stream": "Vytvořit kanál", "Creating bot": "Robot se vytváří", - "Creating stream...": "Skupina se vytváří...", + "Creating stream...": "Kanál se vytváří...", "Current password": "Současné heslo", "Custom emoji added!": "Přidán vlastní emoji!", "Custom filter added!": "Přidán vlastní filtr!", @@ -148,16 +148,16 @@ "Date uploaded": "Datum nahrání", "Day": "Den", "Day mode": "Denní mód", - "Deactivate": "Deaktivovat", - "Deactivate account": "Deaktivovat účet", - "Deactivate now": "Deaktivovat nyní", - "Deactivate organization": "Deaktivovat organizaci", - "Deactivate your account": "Deaktivovat váš účet", - "Deactivated users": "Deaktivovaní uživatelé", + "Deactivate": "Vypnout", + "Deactivate account": "Vypnout účet", + "Deactivate now": "Vypnout nyní", + "Deactivate organization": "Vypnout organizaci", + "Deactivate your account": "Vypnout váš účet", + "Deactivated users": "Vypnutí uživatelé", "Deactivation encountered an error. Please reload and try again.": "Při deaktivaci došlo k chybě. Obnovte stránku a zkuste to prosím znovu.", "Default language": "Výchozí jazyk", - "Default settings for new users joining this organization.": "", - "Default streams": "Výchozí streamy", + "Default settings for new users joining this organization.": "Výchozí nastavení pro nové uživatele, kteří se připojují k této organizaci.", + "Default streams": "Výchozí kanály", "Default user settings": "Výchozí uživatelská nastavení", "Delete": "Smazat", "Delete alert word": "Smazat sledované slovo", @@ -169,12 +169,12 @@ "Delete icon": "Smazat ikonu", "Delete logo": "Smazat logo", "Delete message": "Smazat zprávu", - "Delete messages": "", - "Delete stream": "Smazat stream", + "Delete messages": "Smazat zprávy", + "Delete stream": "Smazat kanál", "Delete topic": "Smazat téma", "Delete user group": "Smazat uživatelskou skupinu", "Deleted successfully!": "Úspěšně smazáno!", - "Deleting this stream will immediately unsubscribe everyone, and the stream's content will not be recoverable.": "Smazáním tohoto streamu bude všem okamžitě zrušen odběr a obsah streamu nepůjde již znovu obnovit.", + "Deleting this stream will immediately unsubscribe everyone, and the stream's content will not be recoverable.": "Smazáním tohoto kanálu bude všem okamžitě zrušen odběr a obsah kanálu nepůjde již znovu obnovit.", "Dense mode": "Zhuštěný mód", "Description": "Popis", "Disabled": "Zakázáno", @@ -214,7 +214,7 @@ "Error adding alert word!": "Chyba při přidávání sledovaného slova!", "Error adding subscription": "Chyba při přidávání odběru", "Error checking subscription": "Chyba při kontrole odběru", - "Error creating stream": "Chyba při vytváření streamu", + "Error creating stream": "Chyba při vytváření kanálu", "Error deleting message": "Chyba při mazání zprávy", "Error fetching message edit history": "Chyba při získávání historie úprav zprávy", "Error getting API key": "Chyba při získávání API klíče", @@ -222,14 +222,14 @@ "Error listing users or bots": "Chyba při zobrazení seznamu uživatelů nebo robotů", "Error removing alert word!": "Chyba při odstraňování sledovaného slova!", "Error removing subscription": "Chyba při odstraňování odběru", - "Error removing user from this stream.": "Chyba při odstraňování uživatele z tohoto streamu.", + "Error removing user from this stream.": "Chyba při odstraňování uživatele z tohoto kanálu.", "Error saving edit": "Chyba při ukládání úpravy", - "Error: Cannot deactivate the only organization administrator.": "Chyba: nelze deaktivovat jediného správce organizace.", + "Error: Cannot deactivate the only organization administrator.": "Chyba: nelze vypnout jediného správce organizace.", "Estimated messages per week": "Odhadovaný počet zpráv za týden", "External link": "Externí odkaz", "Failed": "Nepodařilo se", - "Failed to change notifications stream!": "Nepodařilo se změnit stream pro oznámení!", - "Failed to change signup notifications stream!": "Nepodařilo se změnit stream oznámení o registraci!", + "Failed to change notifications stream!": "Nepodařilo se změnit kanál pro oznámení!", + "Failed to change signup notifications stream!": "Nepodařilo se změnit kanál oznámení o registraci!", "Failed to generate preview": "Nepodařilo se vytvořit náhled", "Failed!": "Nepodařilo se!", "Field choices": "Možnosti", @@ -238,17 +238,17 @@ "File upload is not yet available for your browser.": "Nahrávání souborů není ve vašem prohlížeči zatím podporováno.", "Filter": "Filtr", "Filter bots": "Filtrovat roboty", - "Filter deactivated users": "Filtrovat deaktivované uživatele", + "Filter deactivated users": "Filtrovat vypnuté uživatele", "Filter invites": "Filtrovat pozvánky", - "Filter streams": "Filtrovat streamy", + "Filter streams": "Filtrovat kanály", "Filter users": "Filtrovat uživatele", - "First time? Read our guidelines for creating and naming streams.": "Jste tu poprvé? Přečtěte si naše pokyny, jak vytvářen a pojmenovávat streamy.", + "First time? Read our guidelines for creating and naming streams.": "Jste tu poprvé? Přečtěte si naše pokyny, jak vytvářen a pojmenovávat kanály.", "Forgotten it?": "Zapomněl jste?", "Formatting": "Formátování", "Full name": "Celé jméno", - "Generate invite link": "", + "Generate invite link": "Vytvořit zvací odkaz", "Generate new API key": "Vytvořit nový API klíč", - "Generating link...": "", + "Generating link...": "Vytvoří se odkaz...", "Generic": "Obecný", "Get API key": "Získat API klíč", "Go back": "Jít zpět", @@ -267,8 +267,8 @@ "Incoming webhooks can only send messages.": "Příchozí webhooky mohou pouze odesílat zprávy.", "Interface": "Rozhraní", "Invalid slash command. Check if you are missing a space after the command.": "Neplatný příkaz pomocí lomítka. Ověřte, zda za příkazem nechybí mezera.", - "Invalid stream id": "Neplatné ID streamu", - "Invitation link: __link__": "", + "Invalid stream id": "Neplatné ID kanálu", + "Invitation link: __link__": "Zvací odkaz: __link__", "Invitations": "Pozvánky", "Invite": "Pozvat", "Invite more users": "Pozvat další uživatele", @@ -318,20 +318,20 @@ "Mobile push notifications are not configured on this server.": "Mobilní push notifikace nejsou na tomto serveru nakonfigurovány.", "More details are available in the Help Center article.": "Další podrobnosti jsou k dispozici v článku v Centru nápovědy.", "More than 2 weeks ago": "Před více než 2 týdny", - "Mute stream": "Ztlumit stream", - "Mute the stream __stream.name__": "Ztlumit stream __stream.name__", + "Mute stream": "Ztlumit kanál", + "Mute the stream __stream.name__": "Ztlumit kanál __stream.name__", "Mute the topic __topic__": "Ztlumit téma __topic__", "Mute the topic __topic_name__": "Ztlumit téma __topic_name__", "Mute topic": "Ztlumit téma", - "Muted streams don't show up in \\\"All messages\\\" or generate notifications unless you are mentioned.": "Ztlumené streamy se neukazuji v seznamu \\\"Všechny zprávy\\\" a nechodí z nich notifikace pokud nejste přímo zmíněn/a.", + "Muted streams don't show up in \\\"All messages\\\" or generate notifications unless you are mentioned.": "Ztlumené kanály se neukazuji v seznamu \\\"Všechny zprávy\\\" a nechodí z nich oznámení, pokud nejste přímo zmíněn/a.", "Muted topics": "Ztlumená témata", "N": "N", "Name": "Jméno", "Name or email": "Jméno nebo e-mail", "Narrow to __- message_recipient__": "Zúžit na __- message_recipient__", - "Narrow to stream "__display_recipient__"": "Zúžit na stream "__display_recipient__"", - "Narrow to stream "__display_recipient__", topic "__topic__"": "Zúžit na stream "__display_recipient__", téma "__topic__"", - "Narrow to stream __stream.name__": "Zúžit na stream __stream.name__", + "Narrow to stream "__display_recipient__"": "Zúžit na kanál "__display_recipient__"", + "Narrow to stream "__display_recipient__", topic "__topic__"": "Zúžit na kanál "__display_recipient__", téma "__topic__"", + "Narrow to stream __stream.name__": "Zúžit na kanál __stream.name__", "Narrow to topic __topic_name__": "Zúžit na téma __topic_name__", "Narrow to your private messages with __display_reply_to__": "Zúžit na vaše soukromé zprávy s __display_reply_to__", "Never": "Nikdy", @@ -347,8 +347,8 @@ "New password": "Nové heslo", "New password is too weak": "Nové heslo je příliš slabé", "New private message": "Nová soukromá zpráva", - "New stream message": "Nová zpráva pro stream", - "New stream notifications:": "Nová notifikace ze streamu:", + "New stream message": "Nová zpráva pro kanál", + "New stream notifications:": "Nové oznámení z kanálu:", "New task": "Nový úkol", "New topic": "Nové téma", "New user notifications:": "Nová notifikace od uživatele:", @@ -358,7 +358,7 @@ "No": "Ne", "No bots match your current filter.": "Vašemu nynějšímu filtru neodpovídají žádní roboti.", "No changes made.": "Neprovedeny žádné změny.", - "No default streams match you current filter.": "Vašemu nynějšímu filtru neodpovídají žádné výchozí streamy.", + "No default streams match you current filter.": "Vašemu nynějšímu filtru neodpovídají žádné výchozí kanály.", "No description.": "Žádný popis.", "No drafts.": "Žádné návrhy.", "No invites match your current filter.": "Vašemu nynějšímu filtru neodpovídají žádné pozvánky.", @@ -371,8 +371,8 @@ "Notification sound:": "Zvuk notifikace:", "Notifications": "Notifikace", "Notifications are triggered when a message arrives and Zulip isn't in focus or the message is offscreen.": "Oznámení vyskočí, když přijde zpráva a okno Zulipu není zrovna v popředí nebo je zpráva zrovna mimo aktuální obrazovku. ", - "Notifications stream changed!": "Stream pro oznámení změněn!", - "Notifications stream disabled!": "Stream pro oznámení vypnut!", + "Notifications stream changed!": "Kanál pro oznámení změněn!", + "Notifications stream disabled!": "Kanál pro oznámení vypnut!", "Old password": "Staré heslo", "On __last_active__": "V __last_active__", "On __last_active_date__": "__last_active_date__", @@ -381,8 +381,8 @@ "Only organization administrators can add generic bots": "Pouze správci organizace mohou přidávat obecné roboty", "Only organization administrators can edit these settings.": "Pouze správci organizace mohou upravovat tato nastavení.", "Only organization administrators can post.": "Pouze správci organizace mohou přidávat zprávy.", - "Only organization admins are allowed to post to this stream.": "Pouze správci organizace mohou do tohoto streamu přidávat zprávy.", - "Only stream subscribers can add users to a private stream.": "Do soukromého streamu mohou další uživatele přidávat pouze jeho odběratelé.", + "Only organization admins are allowed to post to this stream.": "Pouze správci organizace mohou do tohoto kanálu přidávat zprávy.", + "Only stream subscribers can add users to a private stream.": "Do soukromého kanálu mohou další uživatele přidávat pouze jeho odběratelé.", "Optional": "Volitelné", "Or, to automatically linkify GitHub's org/repo#1234 syntax:": "Nebo pro automatické generování odkazů GitHubu org/repo#1234:", "Organization": "Organizace", @@ -397,7 +397,7 @@ "Organization settings": "Nastavení organizace", "Other notification settings": "Jiná nastavení notifikací", "Other permissions": "Jiná oprávnění", - "Other settings": "", + "Other settings": "Jiná nastavení", "Outgoing webhook message format": "Formát odchozí webhook zprávy", "Owner": "Vlastník", "Password": "Heslo", @@ -405,13 +405,13 @@ "Password should be at least __length__ characters long": "Heslo by mělo být dlouhé alespoň __length__ znaků", "Pattern": "Předpis", "People to add": "Osoby k přidání", - "Pin stream __stream.name__ to top": "Přišpendlit stream __stream.name__ nahoru", - "Pin stream to top of left sidebar": "Přišpendlit stream v levém postranním panelu nahoru", + "Pin stream __stream.name__ to top": "Přišpendlit kanál __stream.name__ nahoru", + "Pin stream to top of left sidebar": "Přišpendlit kanál v levém postranním panelu nahoru", "Play sound": "Přehrát zvuk", "Please just upload one file.": "Nahrejte prosím pouze jeden soubor.", "Please re-enter your password to confirm your identity.": "Zadejte prosím znovu své heslo pro ověření vaší totožnosti.", "Please specify a date or time": "Zadejte prosím datum nebo čas", - "Please specify a stream": "Zadejte prosím stream", + "Please specify a stream": "Zadejte, prosím, kanál", "Please specify a topic": "Zadejte prosím téma", "Please specify at least one valid recipient": "Prosím zadejte alespoň jednoho platného příjemce", "Prevent users from changing their email address": "Zabránit uživatelům v úpravách jejich e-mailů", @@ -422,8 +422,8 @@ "Profile": "Profil", "Profile field settings": "Nastavení polí profilu", "Quote and reply": "Citovat a odpovědět", - "Reactivate": "Znovu aktivovat", - "Reactivate bot": "Znovu aktivovat robota", + "Reactivate": "Znovu zapnout", + "Reactivate bot": "Znovu zapnout robota", "Remind me about this": "Připomenout", "Reminder not set!": "Připomenutí nebylo nastaveno!", "Reminder set!": "Připomenutí nastaveno!", @@ -431,7 +431,7 @@ "Remove from default": "Odstranit z výchozích", "Reply (r)": "Odpovědět (r)", "Reply mentioning user": "Odpovědět a zmínit uživatele", - "Require topics in stream messages": "Vyžadovat využití témat ve zprávách streamu", + "Require topics in stream messages": "Vyžadovat využití témat ve zprávách kanálu", "Resend": "Poslat znovu", "Resend invitation to ": "Poslat znovu pozvánku pro ", "Resend now": "Poslat znovu teď", @@ -456,6 +456,7 @@ "Search results": "Hledat výsledky", "Search subscribers": "Hledat odběratele", "Search uploads...": "Hledat nahrané soubory...", + "Searched for:": "Hledání:", "See the rest of this message": "Zobrazit zbytek této zprávy", "Select date and time": "Vyberte datum a čas", "Select default language": "Vyberte výchozí jazyk", @@ -466,7 +467,7 @@ "Sent!": "Odesláno!", "Sent! Scroll down to view your message.": "Odesláno! Sescrollujte dolů pro zobrazení vaší zprávy.", "Sent! Your message is outside your current narrow.": "Odesláno! Vaše zpráva je mimo vaše aktuální zúžení zobrazení.", - "Sent! Your message was sent to a stream you have muted.": "Odesláno! Vaše zpráva byla odesláno do streamu, který máte utlumen.", + "Sent! Your message was sent to a stream you have muted.": "Odesláno! Vaše zpráva byla odesláno do kanálu, který máte utlumen.", "Sent! Your message was sent to a topic you have muted.": "Odesláno! Vaše zpráva byla odeslána k tématu, které máte utlumené.", "Sent! Your recent message is outside the current search.": "Odesláno! Vaše poslední zpráva nevyhovuje vašemu aktuálnímu vyhledávacímu dotazu.", "Set a status message": "Nastavit stav", @@ -479,26 +480,26 @@ "Show previews of linked websites": "Ukázat náhledy odkazovaných webů", "Show previews of uploaded and linked images": "Ukázat náhledy nahraných a odkazovaných obrázků", "Show/change your API key": "Ukázat/změnit váš API klíč", - "Signup notifications stream changed!": "Stream pro oznámení o registraci změněn!", - "Signup notifications stream disabled!": "Stream pro oznámení o registraci vypnut!", + "Signup notifications stream changed!": "Kanál pro oznámení o registraci změněn!", + "Signup notifications stream disabled!": "Kanál pro oznámení o registraci vypnut!", "Size": "Velikost", "Slack compatible": "Kompatibilní se Slackem", "Slack's outgoing webhooks": "Odchozí webhooky slacku", "Sorry, the file was too large.": "Je nám líto, soubor byl příliš velký.", "Star": "Hvězdička", - "Stream": "Stream", - "Stream color": "Barva streamu", - "Stream created recently": "Stream vytvořen nedávno", - "Stream creation": "Vytvoření streamu", - "Stream description": "Popis streamu", - "Stream description (optional)": "Popis streamu (volitelné)", - "Stream membership": "Členství ve streamu", - "Stream messages": "Zprávy streamu", - "Stream name": "Název streamu", - "Stream permissions": "Oprávnění ve streamu", - "Stream settings": "Nastavení streamu", - "Stream successfully created!": "Stream úspěšně vytvořen!", - "Streams": "Streamy", + "Stream": "Kanál", + "Stream color": "Barva kanálu", + "Stream created recently": "Kanál vytvořen nedávno", + "Stream creation": "Vytvoření kanálu", + "Stream description": "Popis kanálu", + "Stream description (optional)": "Popis kanálu (volitelné)", + "Stream membership": "Členství v kanálu", + "Stream messages": "Zprávy kanálu", + "Stream name": "Název kanálu", + "Stream permissions": "Oprávnění v kanálu", + "Stream settings": "Nastavení kanálu", + "Stream successfully created!": "Kanál úspěšně vytvořen!", + "Streams": "Kanály", "Submit": "Odeslat", "Subscribe": "Odebírat", "Subscribed": "Odebíráno", @@ -509,20 +510,20 @@ "Text": "Text", "The email body will become the Zulip message": "Z těla e-maiu se stane zpráva v Zulipu", "The email subject will become the Zulip topic": "Z předmětu e-mailu se stane téma v Zulipu", - "The email will be forwarded to this stream": "E-mail bude přeposlán do tohoto streamu", + "The email will be forwarded to this stream": "E-mail bude přeposlán do tohoto kanálu", "The recipient __recipient__ is not valid": "Příjemce __recipient__ není platný ", "The recipients __recipients__ are not valid": "Příjemci __recipients__ nejsou platní ", - "The stream description has been updated!": "Popis streamu byl aktualizován!", - "The stream has been renamed!": "Stream byl přejmenován!", + "The stream description has been updated!": "Popis kanálu byl aktualizován!", + "The stream has been renamed!": "Kanál byl přejmenován!", "Their password will be cleared from our systems, and any bots they maintain will be disabled.": "Jejich heslo bude vymazáno z našich systémů a všichni jimi spravovaní roboti budou vypnuti.", "There are no messages to reply to.": "Nejsou tu žádné zprávy na které lze odpovědět.", - "These settings are explained in detail in the help center.": "Tato nastavení jsou detailně popsána v centru nápovědy.", + "These settings are explained in detail in the help center.": "Tato nastavení jsou podrobně popsána v centru nápovědy.", "This action is permanent and cannot be undone. All users will permanently lose access to their Zulip accounts.": "Tento krok je trvalý a nelze jej vrátit zpět. Všichni uživatelé natrvalo ztratí přístup ke svým účtům v Zulipu.", - "This is a public stream. Any member of the organization can join without an invitation.": "Tohle je veřejný stream. Kdokoliv v rámci organizace se může připojit bez pozvánky.", - "This is a private stream. Only people who have been invited can access its content, but any member of the stream can invite others.": "Toto je soukromý stream. Pouze pozvané osoby mohou zobrazit jeho obsah, ale pozvat další osoby může kterýkoliv člen streamu.", - "This is a private stream": "Toto je soukromý stream", + "This is a public stream. Any member of the organization can join without an invitation.": "Tohle je veřejný kanál. Kdokoliv v rámci organizace se může připojit bez pozvánky.", + "This is a private stream. Only people who have been invited can access its content, but any member of the stream can invite others.": "Toto je soukromý kanál. Pouze pozvané osoby mohou zobrazit jeho obsah, ale pozvat další osoby může kterýkoliv člen kanálu.", + "This is a private stream": "Toto je soukromý kanál", "This organization is configured to restrict editing of message content to __minutes_to_edit__ minutes after it is sent.": "Tato organizace omezila možnost úpravy zprávy na maximálně __minutes_to_edit__ minut, poté co byla zpráva odeslána.", - "This stream is reserved for announcements.
Are you sure you want to message all __count__ people in this stream?": "Tento stream je vyhrazen pro oznámení.
Určitě chcete poslat zprávu všem __count__ členům tohoto streamu?", + "This stream is reserved for announcements.
Are you sure you want to message all __count__ people in this stream?": "Tento kanál je vyhrazen pro oznámení.
Určitě chcete poslat zprávu všem __count__ členům tohoto kanálu?", "Time settings": "Nastavení času", "Time zone": "Časové pásmo", "Time's up!": "Čas vypršel!", @@ -541,12 +542,12 @@ "Unable to upload that many files at once.": "Nelze nahrát tolik souborů najednou.", "Uncheck all": "Odznačit vše", "Unknown": "Neznámý", - "Unless I say otherwise for a particular stream, I want:": "Dokud neřeknu jinak pro nějaký stream, chci:", + "Unless I say otherwise for a particular stream, I want:": "Dokud neřeknu jinak pro nějaký kanál, chci:", "Unmute": "Zrušit ztlumení", - "Unmute the stream __stream.name__": "Zrušit ztlumení skupiny __stream.name__", + "Unmute the stream __stream.name__": "Zrušit ztlumení kanálu __stream.name__", "Unmute the topic __topic__": "Zrušit ztlumení tématu __topic__", "Unmute the topic __topic_name__": "Zrušit ztlumení tématu __topic_name__", - "Unpin stream __stream.name__ from top": "Odepnout stream __stream.name__ zeshora", + "Unpin stream __stream.name__ from top": "Odepnout kanál __stream.name__ zeshora", "Unstar": "Odebrat hvězdičku", "Unsubscribe": "Zrušit odběr", "Unsubscribed successfully!": "Odběr úspěšně zrušen!", @@ -587,21 +588,21 @@ "View private messages to myself": "Zobrazit si vlastní soukromé zprávy", "View source": "Zobrazit zdroj", "View source / Edit topic": "Zobrazit zdroj / upravit téma", - "View stream": "Zobrazit stream", + "View stream": "Zobrazit kanál", "View user profile": "Zobrazit profil uživatele", "View your profile": "Zobrazit váš profil", "Visual desktop notifications": "Viditelné desktopové notifikace", - "Warning: __stream_name__ is a private stream.": "Upozornění: stream __stream_name__ je soukromý", + "Warning: __stream_name__ is a private stream.": "Upozornění: kanál __stream_name__ je soukromý", "We are about to have a poll. Please wait for the question.": "Proběhne anketa. Počkejte na otázku.", - "We recommend against deleting topics unless needed for security reasons or managing abuse. Deleted messages can be confusing for users who may later visit the topic via notifications.": "", + "We recommend against deleting topics unless needed for security reasons or managing abuse. Deleted messages can be confusing for users who may later visit the topic via notifications.": "Doporučujeme témata nemazat kromě případů, kdy jde o otázku bezpečnosti, nebo pokud témata někdo zneužívá. Smazané zprávy mohou být matoucí pro uživatele, kterým chodí oznámení o nových zprávách z tématu.", "Who can add bots": "Kdo může přidávat roboty", "Who can add custom emoji": "Kdo může přidat vlastní emoji", - "Who can create streams": "Kdo může vytvářet streamy", + "Who can create streams": "Kdo může vytvářet kanály", "Who can see users email addresses": "Kdo může zobrazit e-maily uživatelů", "Working\u2026": "Pracuji...", "Write": "Psát", "Yes": "Ano", - "Yes, delete this stream": "Ano, smazat tento stream", + "Yes, delete this stream": "Ano, smazat tento kanál", "Yes, send": "Ano, odeslat", "Yes, subscribe __count__ users!": "Ano, nastavit odběr __count__ uživatelům!", "Yes. Members and admins can send invitations.": "Ano. Členové a správci mohou posílat pozvánky.", @@ -609,21 +610,21 @@ "Yesterday": "Včera", "You and __display_reply_to__": "Vy a __display_reply_to__", "You and __recipients__": "Vy a __recipients__", - "You are not currently subscribed to this stream.": "Momentálně tento stream neodebíráte.", - "You are not subscribed to stream __stream__": "Nemáte nastaven odběr streamu __stream__", + "You are not currently subscribed to this stream.": "Momentálně tento kanál neodebíráte.", + "You are not subscribed to stream __stream__": "Nemáte nastaven odběr kanálu __stream__", "You can send emails to Zulip! Just copy and use this address as an email recipient, and:": "Zulipu můžete posílat i e-maily! Zkopírujte a použijte tuto adresu jako příjemce a:", - "You cannot create a stream with no subscribers!": "Nelze vytvořit stream, který nemá žádné odběratele!", - "You have muted the topic under the stream.": "Ztlumil/a jste téma ve streamu .", + "You cannot create a stream with no subscribers!": "Nelze vytvořit kanál, který nemá žádné odběratele!", + "You have muted the topic under the stream.": "Ztlumil/a jste téma v kanálu .", "You have no active bots.": "Nemáte žádné aktivní roboty.", "You have no inactive bots.": "Nemáte žádné neaktivní roboty.", "You have not muted any topics yet.": "Ještě jste neztlumil/a žádné téma!", "You have not uploaded any files.": "Ještě jste nenahrál/a žádné soubory.", "You have nothing to send!": "Nemáte nic k odeslání!", - "You must be an organization administrator to create a stream without subscribing.": "Abyste mohl/a vytvořit stream bez toho, aniž byste ho také odebíral/a, musíte být správcem organizace.", + "You must be an organization administrator to create a stream without subscribing.": "Abyste mohl/a vytvořit kanál bez toho, aniž byste ho také odebíral/a, musíte být správcem organizace.", "You need to be running Zephyr mirroring in order to send messages!": "Abyste mohl/a odesílat zprávy, musíte zajistit funkční zrcadlení Zephyr!", - "You subscribed to stream __stream__": "Přihlásil/a jste se k odběru streamu __stream__", - "You unsubscribed from stream __stream__": "Odhlásil/a jste se z odběru streamu __stream__", - "You're not subscribed to this stream. You will not be notified if other users reply to your message.": "Tento stream neodebíráte. Pokud vám někdo odpoví na vaši zprávu, nedostanete o tom žádné upozornění.", + "You subscribed to stream __stream__": "Přihlásil/a jste se k odběru kanálu __stream__", + "You unsubscribed from stream __stream__": "Odhlásil/a jste se z odběru kanálu __stream__", + "You're not subscribed to this stream. You will not be notified if other users reply to your message.": "Tento kanál neodebíráte. Pokud vám někdo odpoví na vaši zprávu, nedostanete o tom žádné upozornění.", "Your API key:": "Váš API kíč:", "Your account": "Váš účet", "Your bots": "Vaši roboti", @@ -640,7 +641,7 @@ "__minutes__ minutes ago": "před __minutes__ minutami", "__seconds__ sec to edit": "__seconds__ sekund na úpravu", "__starred_status__ this message": "__starred_status__ tuto zprávu", - "__wildcard_mention_token__ (Notify stream)": "__wildcard_mention_token__ (upozornit stream)", + "__wildcard_mention_token__ (Notify stream)": "__wildcard_mention_token__ (upozornit kanál)", "and": "a", "cookie": "cookie", "group private messages with __recipient__": "skupinová soukromá zpráva s __recipient__", diff --git a/static/locale/de/LC_MESSAGES/django.po b/static/locale/de/LC_MESSAGES/django.po index 59a7f06df9..5a780a8f8f 100644 --- a/static/locale/de/LC_MESSAGES/django.po +++ b/static/locale/de/LC_MESSAGES/django.po @@ -17,7 +17,7 @@ # BornToBeRoot, 2015 # n3w2oo , 2016 # Niklas P , 2016 -# Robert Hönig , 2017-2018 +# Robert Hönig , 2017-2019 # Robin Richtsfeld , 2018 # Tim Abbott , 2018 # Torsten Bauersfeld , 2019 @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 20:52+0000\n" "Last-Translator: Robert Hönig \n" "Language-Team: German (http://www.transifex.com/zulip/zulip/language/de/)\n" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ msgstr "Etwas ist schief gelaufen. Bitte warte ein paar Sekunden und versuche es #: corporate/views.py:56 msgid "You must invoice for at least {} users." -msgstr "" +msgstr "Du musst für mindestens {} Nutzer per Rechnung zahlen." #: corporate/views.py:63 msgid "No payment method on file" @@ -306,8 +306,8 @@ msgstr "Registrieren" msgid "OR" msgstr "ODER" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Registrieren mit %(identity_provider)s" @@ -462,7 +462,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Bist Du sicher, dass du diese Nachricht löschen möchtest?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Abbrechen" @@ -611,11 +611,11 @@ msgid "" " " msgstr "\nErfahre mehr über Erwähnungen \nhier." -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Noch Niemand hat darüber gesprochen!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Nachrichten" @@ -647,48 +647,48 @@ msgstr "Jetzt versuchen." msgid "Invite users to Zulip" msgstr "Benutzer zu Zulip einladen" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "E-Mail Adressen (eine je Zeile oder kommagetrennt)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Eine oder mehrere Email-Adressen." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" -msgstr "" +msgstr "oder" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" -msgstr "" +msgstr "erstelle Einladungs Link" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Nutzer treten bei als" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Mitglieder" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Organisation-Administratoren" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "Gäste" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Streams die für den Benutzer standardmäßig abonnier sind" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Lädt ein..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Einladen" @@ -754,7 +754,7 @@ msgid "Navigation" msgstr "Navigation" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Suche nach" @@ -837,7 +837,7 @@ msgstr "Filtere nach nicht-stummgeschalteten Nachrichten" #: templates/zerver/app/keyboard_shortcuts.html:191 msgid "Narrow to current compose box recipient" -msgstr "" +msgstr "Auf den aktuellen Empfänger im Editorfenster begrenzen." #: templates/zerver/app/keyboard_shortcuts.html:197 msgid "Message actions" @@ -956,7 +956,7 @@ msgstr "Streams abonnieren, konfigurieren oder hinzufügen" msgid "Filter streams" msgstr "Streams filtern" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Alle Streams" @@ -1156,14 +1156,14 @@ msgstr "Benutzer filtern" msgid "USERS" msgstr "BENUTZER" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Lade neue Benutzer ein" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "GRUPPENNACHRICHTEN" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Lade neue Benutzer ein" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operator" @@ -1441,38 +1441,38 @@ msgstr "Gastnutzer" msgid "Normal users" msgstr "Normale Benutzer" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 +#, python-format +msgid "Hi %(user_name)s," +msgstr "Hi %(user_name)s," + +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" Hi %(user_name)s,\n" -" " -msgstr "\n Hallo %(user_name)s,\n " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" +msgstr "Wir haben eine Anfrage erhalten, die Email-Adresse für den Zulip-Account auf\n %(realm_uri)s von %(old_email)s zu %(new_email)s zu ändern. \n Falls Du diese Änderung bestätigen möchtest, klicke bitte hier unten: " -#: templates/zerver/emails/compiled/confirm_new_email.html:16 -#, python-format -msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " -msgstr "\nWir haben eine Anfrage erhalten, die Email-Adresse für den Zulip-Account auf\n%(realm_uri)s von %(old_email)s zu %(new_email)s zu ändern. \nFalls Du diese Änderung bestätigen möchtest, klicke bitte hier unten:" - -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Änderung der Email-Adresse bestätigen" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " -msgstr "\nFalls Du diese Änderung nicht beantragt hast, kontaktiere uns bitte sofort \nunter %(support_email)s." +"If you did not request this change, please contact us immediately at %(support_email)s." +msgstr "Falls Du diese Änderung nicht beantragt hast, kontaktiere uns bitte sofort \n unter %(support_email)s." #: templates/zerver/emails/compiled/confirm_registration.html:10 #: templates/zerver/emails/confirm_registration.source.html:9 @@ -1486,48 +1486,50 @@ msgid "Click the button below to complete registration." msgstr "Klicke den Button unten um die Registrierung abschließen" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Registrierung abschließen" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " -msgstr "\n Kontaktiere uns jeder Zeit\n %(support_email)s\n bei Problemen, mit Feedback oder zum Chatten!\n " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" +msgstr "Kontaktiere uns jeder Zeit\n %(support_email)s\n bei Problemen, mit Feedback oder zum Chatten!\n " -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "Du kannst Dich bei deiner Zulip-Organisation\n%(realm_name)s unter folgendem Link anmelden:" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "Die mit Deinem Account verbundene Email-Adresse ist %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "Falls Du Probleme hast Dich anzumelden, kontaktiere bitte Zulip indem Du auf diese Mail antwortest." -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1540,83 +1542,81 @@ msgid "Welcome to Zulip!" msgstr "Willkommen bei Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Du hast einen neue Zulip Organisation erstellt %(realm_name)s.\n " +msgid "You've created the new Zulip organization %(realm_name)s." +msgstr "Du hast einen neue Zulip Organisation erstellt %(realm_name)s." -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Du bist Mitglied der Zulip Organisation %(realm_name)s.\n " +msgid "You've joined the Zulip organization %(realm_name)s." +msgstr "Du bist Mitglied der Zulip Organisation %(realm_name)s- " -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "Details zu deinem Account:" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "URL der Organisation" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "Benutzername:" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "Benutze deinen LDAP Account zum Einlogen" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "E-Mail" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " -msgstr "\n (du benötigst diese zum anmelden bei mobile and desktop apps)\n " +"(you'll need these to sign in to the mobile and desktop " +"apps)" +msgstr "(du benötigst diese zum anmelden bei mobile and desktop apps)\n " -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " -msgstr "\nSieh dir unsere Admin-Anleitung an, werde mit wenigen Tastaturkürzeln\nzum Zulip-Profi oder beginne direkt mit der Nutzung!" +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" +msgstr "Sieh dir unsere Admin-Anleitung an, werde mit wenigen Tastaturkürzeln\nzum Zulip-Profi oder beginne direkt mit der Nutzung!" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " -msgstr "\nErfahre mehr über Zulip, werde mit wenigen Tastaturkürzeln zum Profi oder beginne direkt mit der Nutzung!" +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" +msgstr "Erfahre mehr über Zulip, werde mit wenigen Tastaturkürzeln zum Profi oder beginne direkt mit der Nutzung!" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Viele Grüße," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1625,15 +1625,15 @@ msgstr "Viele Grüße," msgid "Team Zulip" msgstr "das Zulip Team" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " -msgstr "" +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" +msgstr "PS: Folge uns auf Twitter,\n gib uns einen Stern auf GitHub, oder\n chatte mit uns live auf dem\n Zulip Community Server!" #: templates/zerver/emails/compiled/followup_day2.html:9 #: templates/zerver/emails/followup_day2.source.html:8 @@ -1647,7 +1647,7 @@ msgstr "Hey," msgid "" "I wanted to share one last thing with you: a few tips about topics, since " "mastering topics is a key part of being a Zulip power user." -msgstr "" +msgstr "Ich wollte noch eine letzte Sache mit Dir teilen: Ein paar Tips über Themen, denn deren Beherrschung ist ein Schlüssel um ein effizienter Zulip Nutzer zu werden." #: templates/zerver/emails/compiled/followup_day2.html:15 msgid "" @@ -1676,15 +1676,15 @@ msgid "" "(imagine if email didn't have them!), and it lets you more efficiently catch" " up on what's happened while you're away—read the topics that are relevant " "to you, and ignore the ones that aren't!" -msgstr "" +msgstr "Wieso braucht man Themen? Es gibt zwei Gründe: Sie machen Unterhaltungen leichter zu folgen (stell Dir nur vor, dass E-Mails keine Themen hätten!) und sie ermöglichen es Dir, effizienter die Konversationen aufzuholen, die passiert sind, während Du abwesen ist - ließ die Themen, die für Dich relevant sind, und ignoriere die anderen!" #: templates/zerver/emails/compiled/followup_day2.html:26 #: templates/zerver/emails/followup_day2.source.html:25 msgid "Take it for a spin now." -msgstr "" +msgstr "Probier es jetzt aus." #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1700,7 +1700,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1720,14 +1720,14 @@ msgstr "Hallo," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " -msgstr "" +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." +msgstr "%(referrer_full_name)s(%(referrer_email)s) will, dass Du Dich mit ihm auf Zulip verbindest - dem Team-Kommunikationstool, dass für Produktivität entworfen wurde." -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1739,17 +1739,16 @@ msgstr "Um loszulegen, klicke bitte hier:" msgid "Hi again," msgstr "Hallo nochmal," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " -msgstr "" +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." +msgstr "Dies ist eine freundliche Erinnerung, dass %(referrer_name)s(%(referrer_email)s) will, dass Du Dich mit Ihm auf Zulip verbindest - dem Team Kommunikationstool, die für Produktivität entworfen wurde." -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1770,7 +1769,7 @@ msgid "" "change, please contact us immediately at %(support_email)s." -msgstr "" +msgstr "Die mit Deinem Zulip-Account verbundene Email wurde vor kurzem zu %(new_email)s geändert. Falls Du diese Änderung nicht vorgenommen hast, kontaktiere uns bitte sofort unter %(support_email)s." #: templates/zerver/emails/compiled/notify_change_in_email.html:14 #: templates/zerver/emails/notify_change_in_email.source.html:13 @@ -1779,198 +1778,178 @@ msgid "Best," msgstr "Viele Grüße," #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " -msgstr "" +"%(user_email)s" +msgstr "Organisation: %(organization_url)s Zeit: %(login_time)s Email: %(user_email)s" #: templates/zerver/emails/compiled/notify_new_login.html:13 #: templates/zerver/emails/notify_new_login.source.html:12 #: templates/zerver/emails/notify_new_login.txt:1 msgid "We noticed a recent login for the following Zulip account." -msgstr "" +msgstr "Wir haben einen kürlichen Login für den folgenden Zulip Account detektiert." -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " -msgstr "\nOrganisation: %(realm_uri)s" +"Organization: %(realm_uri)s" +msgstr "Organisation: %(realm_uri)s" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " -msgstr "\nE-Mail: %(user_email)s" +"Email: %(user_email)s" +msgstr "Email: %(user_email)s" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " -msgstr "\nUhrzeit: %(login_time)s" +msgid "Time: %(login_time)s" +msgstr "Uhrzeit: %(login_time)s" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " -msgstr "\nGerät: %(device_browser)s unter %(device_os)s" +msgid "Device: %(device_browser)s on %(device_os)s." +msgstr "Gerät: %(device_browser)s unter %(device_os)s" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " -msgstr "\nIP-Adresse: %(device_ip)s" +msgid "IP address: %(device_ip)s" +msgstr "IP-Adresse: %(device_ip)s" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "Falls du das selbst warst, musst du nichts weiter tun." -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " -msgstr "\nFalls du diese Enmeldung nicht erkennst oder glaubst, dass dein Konto möglicherweise gehackt wurde,\nsetze bitte dein Passwort zurück oder melde dich umgehend unter %(support_email)s bei uns." +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." +msgstr "Falls du diese Enmeldung nicht erkennst oder glaubst, dass dein Konto möglicherweise gehackt wurde,\nsetze bitte dein Passwort zurück oder melde dich umgehend unter %(support_email)s bei uns." -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "Sicherheit" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "Keine Anmeldebenachrichtigungen mehr erhalten" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " -msgstr "\nJemand (möglicherweise du selbst) hat ein neues Passwort für dein Zulip-Konto %(email)s bei %(realm_uri)s angefordert." +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." +msgstr "Jemand (möglicherweise du selbst) hat ein neues Passwort für dein Zulip-Konto %(email)s bei %(realm_uri)s angefordert." -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "Klicke den Button unten um dein Passwort zu ändern." -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Passwort zurücksetzen" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " -msgstr "" +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." +msgstr "Du hattest einmal einen Account auf %(realm_uri)s, aber er wurde deaktiviert. Du kannst einen Organisations-Administrator kontaktieren um Deinen Account zu reaktivieren." -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " -msgstr "\n Du hast keinen Account in dieser Zulip Organisation.\n " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." +msgstr "Du hast keinen Account in dieser Zulip Organisation." -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "Du hast aktive Accounts in folgender/n Organistation(en)" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " -msgstr "\n Du kannst versuchen dich anzumelden oder dein Passwort zu ändern. In der/n Organisation(en) oberhalb.\n " +"You can try logging in or resetting your password in the organization(s) " +"above." +msgstr "Du kannst versuchen dich anzumelden oder dein Passwort zu ändern. In der/n Organisation(en) oberhalb." -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " -msgstr "" +"If you do not recognize this activity, you can safely ignore this email." +msgstr "Falls Du diese Aktivität nicht wiedererkennt, kannst Du diese Email ignorieren." -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "Lieber ehemaliger Administrator der %(realm_name)s," + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " -msgstr "\n Lieber ehemaliger Administrator der %(realm_name)s,\n " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." +msgstr "Einer Deiner Administratoren hat eine Reaktivierung der ehemals deaktivierten Zulip-Organisation auf %(realm_uri)s beantragt." -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "Klicke den Button unten um deine Organisation zu reaktivieren." -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "Organisation reaktivieren" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" -msgstr "" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." +msgstr "Falls die Anfrage ungewollt ist, musst Du nichts machen - der Link wird in 24 Stunden auslaufen." #: templates/zerver/emails/confirm_new_email.source.html:13 #, python-format msgid "" "If you did not request this change, please contact us immediately at %(support_email)s." -msgstr "" +msgstr "Falls Du diese Änderung nicht vorgenommen hast, kontaktiere uns bitte sofort unter %(support_email)s." #: templates/zerver/emails/confirm_new_email.subject.txt:1 msgid "Verify your new email address" @@ -1981,7 +1960,7 @@ msgstr "Bestätige deine neue Email-Adresse." msgid "" "If you did not request this change, please contact us immediately at " "<%(support_email)s>." -msgstr "" +msgstr "Falls du Diese Änderung nicht vorgenommen hast, kontaktiere uns bitte sofort unter <%(support_email)s>." #: templates/zerver/emails/confirm_registration.source.html:15 #: templates/zerver/emails/invitation.source.html:18 @@ -1992,7 +1971,7 @@ msgid "" "Contact us any time at %(support_email)s if you run into " "trouble, have any feedback, or just want to chat!" -msgstr "" +msgstr "Kontaktiere uns jeder Zeit %(support_email)s bei Problemen, mit Feedback oder zum Chatten!" #: templates/zerver/emails/confirm_registration.subject.txt:1 msgid "Activate your Zulip account" @@ -2008,42 +1987,17 @@ msgstr "Klicke den Button unten um die Registrierung abschließen!" msgid "" "Contact us any time at %(support_email)s if you run into trouble,have any " "feedback, or just want to chat!" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" +msgstr "Kontaktiere uns jeder Zeit %(support_email)s bei Problemen, mit Feedback oder zum Chatten!" #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "Deine Zulip Loginseite" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the mobile and desktop apps)" -msgstr "" +msgstr "(du benötigst diese zum anmelden bei Mobil- und Desktop- Anwendungen) " #: templates/zerver/emails/followup_day1.source.html:35 #, python-format @@ -2052,7 +2006,7 @@ msgid "" "become a Zulip pro with a few keyboard shortcuts, or dive right in!" -msgstr "" +msgstr "Sieh dir unsere Admin-Anleitung an, werde mit wenigen Tastaturkürzeln\nzum Zulip-Profi oder beginne direkt mit der Nutzung!" #: templates/zerver/emails/followup_day1.source.html:37 #, python-format @@ -2060,40 +2014,40 @@ msgid "" "Learn more about Zulip, become a " "pro with a few keyboard " "shortcuts, or dive right in!" -msgstr "" +msgstr "Erfahre mehr über Zulip, werde mit wenigen Tastaturkürzeln\nzum Zulip-Profi oder beginne direkt mit der Nutzung!" #: templates/zerver/emails/followup_day1.source.html:47 msgid "" "PS: Follow us on Twitter, star us " "on GitHub, or chat with us " "live on the Zulip community server!" -msgstr "" +msgstr "PS: Folge uns auf gib uns einen Stern auf GitHub, chatte mit uns live auf Zulip Community Server!" #: templates/zerver/emails/followup_day1.subject.txt:2 #, python-format msgid "%(realm_name)s on Zulip: Your new organization details" -msgstr "" +msgstr "%(realm_name)s auf Zulip: Details zu Deiner neuen Organisation" #: templates/zerver/emails/followup_day1.subject.txt:4 #, python-format msgid "%(realm_name)s on Zulip: Your new account details" -msgstr "" +msgstr "%(realm_name)s auf Zulip: Details zu Deinem neuen Account" #: templates/zerver/emails/followup_day1.txt:4 #, python-format msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" +msgstr "Du hast einen neue Zulip Organisation erstellt %(realm_name)s." #: templates/zerver/emails/followup_day1.txt:6 #, python-format msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" +msgstr "Du bist Mitglied der Zulip Organisation %(realm_name)s." #: templates/zerver/emails/followup_day1.txt:21 msgid "" "(you'll need these to sign in to the mobile and desktop apps " "(https://zulipchat.com/apps))" -msgstr "" +msgstr "(du benötigst diese zum Anmelden bei Mobil- und Desktopanwendungen (https://zulipchat.com/apps))" #: templates/zerver/emails/followup_day1.txt:25 #, python-format @@ -2101,7 +2055,7 @@ msgid "" "Check out our guide (%(getting_started_link)s) for admins, become a Zulip " "pro with a few keyboard shortcuts (%(keyboard_shortcuts_link)s), or dive " "right in to %(realm_uri)s!" -msgstr "" +msgstr "Sieh dir unsere Anleitung (%(getting_started_link)s) für Admins an, werde mit wenigen Tastaturkürzeln (%(keyboard_shortcuts_link)s) zum Zulip-Profi oder beginne direkt mit der Nutzung von %(realm_uri)s!" #: templates/zerver/emails/followup_day1.txt:27 #, python-format @@ -2109,21 +2063,21 @@ msgid "" "Learn more (%(getting_started_link)s) about Zulip, become a pro with a few " "keyboard shortcuts (%(keyboard_shortcuts_link)s), or dive right in to " "%(realm_uri)s!" -msgstr "" +msgstr "Erfahre mehr (%(getting_started_link)s) über Zulip, werde mit wenigen Tastaturkürzeln (%(keyboard_shortcuts_link)s) zum Zulip-Profi oder beginne direkt mit der Nutzung von %(realm_uri)s!" #: templates/zerver/emails/followup_day1.txt:34 msgid "" "PS: Check us out on Twitter (@zulip), star us on GitHub " "(https://github.com/zulip/zulip), or chat with us live on the Zulip " "community server (https://chat.zulip.org)!" -msgstr "" +msgstr "PS: Folge uns auf Twitter (@zulip) gib uns einen Stern auf GitHub (https://github.com/zulip/zulip), chatte mit uns live auf Zulip Community Server (https://chat.zulip.org)!" #: templates/zerver/emails/followup_day2.source.html:14 msgid "" "Topics are like email subject lines. The big difference, though, is that " "they're really short and lightweight. Two or three words will do it. Don't " "overthink 'em—you can always edit the message later!" -msgstr "" +msgstr "Themen sind vergleichbar mit dem Betreff einer Email. Der große Unterschied ist jedoch, dass sie sehr kurz und leichtgewichtig sind. Zwei oder drei Wörter reichen aus. Zerbrich dir nicht den Kopf darüber, du kannst die Nachricht später noch bearbeiten!" #: templates/zerver/emails/followup_day2.source.html:23 msgid "" @@ -2131,18 +2085,18 @@ msgid "" "(imagine if email didn't have them!), and it lets you more efficiently catch" " up on what's happened while you're away—read the topics that are " "relevant to you, and ignore the ones that aren't!" -msgstr "" +msgstr "Wieso braucht man Themen? Es gibt zwei Gründe: Sie machen Unterhaltungen leichter zu folgen (stell Dir nur vor, dass E-Mails keine Themen hätten!) und sie ermöglichen es Dir, effizienter die Konversationen aufzuholen, die passiert sind, während Du abwesen ist - ließ die Themen, die für Dich relevant sind, und ignoriere die anderen!" #: templates/zerver/emails/followup_day2.subject.txt:1 msgid "One last thing: using topics like a pro" -msgstr "" +msgstr "Eine letzte Sache: Die effiziente Nutzung von Themen" #: templates/zerver/emails/followup_day2.txt:5 msgid "" "Topics are like email subject lines. The big difference, though, is that " "they're really short and lightweight. Two or three words will do it. Don't " "overthink 'em -- you can always edit the message later!" -msgstr "" +msgstr "Themen sind vergleichbar mit dem Betreff einer Email. Der große Unterschied ist jedoch, dass sie sehr kurz und leichtgewichtig sind. Zwei oder drei Wörter reichen aus. Zerbrich dir nicht den Kopf darüber, du kannst die Nachricht später noch bearbeiten!" #: templates/zerver/emails/followup_day2.txt:11 msgid "" @@ -2150,15 +2104,15 @@ msgid "" "(imagine if email didn't have them!), and it lets you more efficiently catch" " up on what's happened while you're away -- read the topics that are " "relevant to you, and ignore the ones that aren't!" -msgstr "" +msgstr "Wieso braucht man Themen? Es gibt zwei Gründe: Sie machen Unterhaltungen leichter zu folgen (stell Dir nur vor, dass E-Mails keine Themen hätten!) und sie ermöglichen es Dir, effizienter die Konversationen aufzuholen, die passiert sind, während Du abwesen ist - ließ die Themen, die für Dich relevant sind, und ignoriere die anderen!" #: templates/zerver/emails/followup_day2.txt:13 msgid "Take it for a spin now:" -msgstr "" +msgstr "Probier es jetzt aus:" #: templates/zerver/emails/followup_day2.txt:19 msgid "Manage email preferences:" -msgstr "" +msgstr "E-Mail-Einstellungen verwalten:" #: templates/zerver/emails/followup_day2.txt:22 msgid "Unsubscribe from welcome emails:" @@ -2170,12 +2124,12 @@ msgid "" "%(referrer_full_name)s (%(referrer_email)s)wants you to join " "them on Zulip — the team communication tool designed for productivity." -msgstr "" +msgstr "%(referrer_full_name)s(%(referrer_email)s) will, dass Du Dich mit ihm auf Zulip verbindest - dem Team-Kommunikationstool, dass für Produktivität entworfen wurde." #: templates/zerver/emails/invitation.subject.txt:1 #, python-format msgid "%(referrer_full_name)s invited you to join %(referrer_realm_name)s" -msgstr "" +msgstr "%(referrer_full_name)s hat Dich eingeladen, %(referrer_realm_name)s beizutreten" #: templates/zerver/emails/invitation.txt:3 #, python-format @@ -2196,12 +2150,12 @@ msgid "" "href=\"mailto:%(referrer_email)s\">%(referrer_email)s) wants you to join" " them on Zulip — the team communication tool designed for " "productivity." -msgstr "" +msgstr "Dies ist eine freundliche Erinnerung, dass %(referrer_name)s(%(referrer_email)s) will, dass Du Dich mit ihm auf Zulip verbindest - dem Team-Kommunikationstool, dass für Produktivität entworfen wurde." #: templates/zerver/emails/invitation_reminder.subject.txt:1 #, python-format msgid "Reminder: Join %(referrer_name)s at %(referrer_realm_name)s" -msgstr "" +msgstr "Erinnerung: Tritt %(referrer_name)s auf %(referrer_realm_name)s bei." #: templates/zerver/emails/invitation_reminder.txt:3 #, python-format @@ -2209,7 +2163,7 @@ msgid "" "This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) " "wants you to join them on Zulip -- the team communication tool designed for " "productivity." -msgstr "" +msgstr "Dies ist eine freundliche Erinnerung, dass %(referrer_name)s (%(referrer_email)s) möchte, dass Du ihr/ihm auf Zulip beitrittst -- der Team-Kommunikationssoftware, die für Produktivität entworfen wurde." #: templates/zerver/emails/invitation_reminder.txt:10 #: templates/zerver/emails/realm_reactivation.txt:13 @@ -2217,7 +2171,7 @@ msgstr "" msgid "" "Contact us any time at %(support_email)s if you run into trouble, have any " "feedback, or just want to chat!" -msgstr "" +msgstr "Kontaktiere uns jeder Zeit %(support_email)s bei Problemen, mit Feedback oder zum Chatten!" #: templates/zerver/emails/notify_change_in_email.source.html:10 #, python-format @@ -2226,7 +2180,7 @@ msgid "" "href=\"%(new_email)s\">%(new_email)s. If you did not request this " "change, please contact us immediately at %(support_email)s." -msgstr "" +msgstr "Die mit Deinem Zulip-Account verbundene Email wurde vor kurzen zu %(new_email)s geändert. Falls Du diese Änderung nicht vorgenommen hast, kontaktiere uns bitte sofort unter %(support_email)s." #: templates/zerver/emails/notify_change_in_email.subject.txt:1 #, python-format @@ -2239,42 +2193,17 @@ msgid "" "The email associated with your Zulip account was recently changed to " "%(new_email)s. If you did not request this change, please contact us " "immediately at <%(support_email)s>." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" +msgstr "Die mit Deinem Zulip-Account verbundene Email wurde vor kurzem zu %(new_email)s geändert. Falls Du diese Änderung nicht vorgenommen hast, kontaktiere uns bitte sofort unter %(support_email)s." #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" -msgstr "" +msgstr "Organisation: %(realm_uri)s" #: templates/zerver/emails/notify_new_login.source.html:19 #, python-format msgid "Email: %(user_email)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "Uhrzeit: %(login_time)s" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "Gerät: %(device_browser)s unter %(device_os)s" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" +msgstr "Email: %(user_email)s" #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format @@ -2283,7 +2212,7 @@ msgid "" "compromised, please reset your password or contact us immediately at %(support_email)s." -msgstr "" +msgstr "Falls du diese Enmeldung nicht erkennst oder glaubst, dass dein Konto möglicherweise gehackt wurde,\nsetze bitte dein Passwort zurück oder melde dich umgehend unter %(support_email)s bei uns." #: templates/zerver/emails/notify_new_login.subject.txt:1 #, python-format @@ -2307,15 +2236,7 @@ msgid "" "compromised, please reset your password at " "%(realm_uri)s/accounts/password/reset/ or contact us immediately at " "%(support_email)s." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" +msgstr "Falls du diese Enmeldung nicht erkennst oder glaubst, dass dein Konto möglicherweise gehackt wurde, setze bitte dein Passwort zurück auf %(realm_uri)s/accounts/password/reset oder melde dich umgehend unter %(support_email)s bei uns." #: templates/zerver/emails/password_reset.source.html:19 #, python-format @@ -2324,25 +2245,7 @@ msgid "" " You can contact an organization administrator to reactivate your " "account." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" +msgstr "Du hattest einmal einen Account auf %(realm_uri)s, aber er wurde deaktiviert. Du kannst einen Organisations-Administrator kontaktieren um Deinen Account zu reaktivieren." #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format @@ -2358,28 +2261,7 @@ msgstr "Klicke den Button unten um dein Passwort zu ändern!" msgid "" "You previously had an account on %(realm_uri)s, but it has been deactivated." " You can contact an organization administrator to reactivate your account." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" +msgstr "Du hattest einmal einen Account auf %(realm_uri)s, aber er wurde deaktiviert. Du kannst einen Organisations-Administrator kontaktieren um Deinen Account zu reaktivieren." #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." @@ -2549,7 +2431,7 @@ msgstr "Jetzt anmelden" #: templates/zerver/hello.html:544 msgid "Sign up now" -msgstr "" +msgstr "Jetzt registrieren" #: templates/zerver/integrations/index.html:23 #, python-format @@ -2718,15 +2600,15 @@ msgstr "Der Link zur Reaktivierung der Organisationen ist abgelaufen oder nicht #: templates/zerver/realm_redirect.html:8 msgid "Log in to your organization" -msgstr "" +msgstr "Melde Dich bei Deiner Organisation an" #: templates/zerver/realm_redirect.html:18 msgid "Enter your organization's Zulip URL:" -msgstr "" +msgstr "Gib die Zulip URL Deiner Organisation ein>" #: templates/zerver/realm_redirect.html:21 msgid "your-organization-url" -msgstr "" +msgstr "url-deiner-organisation" #: templates/zerver/realm_redirect.html:32 msgid "Next" @@ -2734,19 +2616,19 @@ msgstr "Nächste" #: templates/zerver/realm_redirect.html:34 msgid "Don't know your organization URL?" -msgstr "" +msgstr "Du kennst die URL Deiner Organisation nicht?" #: templates/zerver/realm_redirect.html:35 msgid "Find your organization." -msgstr "" +msgstr "Finde Deine Organisation." #: templates/zerver/realm_redirect.html:43 msgid "Need to get your group started on Zulip?" -msgstr "" +msgstr "Willst Du, dass Deine Gruppe bei Zulip loslegt?" #: templates/zerver/realm_redirect.html:43 msgid "Create a new organization." -msgstr "" +msgstr "Neue Organisation erstellen." #: templates/zerver/register.html:20 msgid "" @@ -2754,7 +2636,7 @@ msgid "" "

You’re almost there.

\n" "

We just need you to do one last thing.

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

Du hast es fast geschafft.

\n

Du musst nur noch eine letzte Sache machen.

" #: templates/zerver/register.html:38 msgid "Organization name" @@ -2779,11 +2661,11 @@ msgstr "Die E-Mail-Adresse, mit der du dich bei deiner Organisation anmeldest." #: templates/zerver/register.html:107 msgid "Import settings from existing Zulip account" -msgstr "" +msgstr "Einstellungen von einem anderen Zulip-Account importieren" #: templates/zerver/register.html:113 msgid "Don’t import settings" -msgstr "" +msgstr "Keine Einstellungen importieren" #: templates/zerver/register.html:132 msgid "Full name or 名前" @@ -2795,7 +2677,7 @@ msgstr "Vollständiger Name" #: templates/zerver/register.html:152 msgid "Enter your LDAP/Active Directory password." -msgstr "" +msgstr "Gib Dein LDAP/Active Directory Passwort ein." #: templates/zerver/register.html:165 msgid "" @@ -2907,7 +2789,7 @@ msgid "" "

This organization has been migrated to new hosting on zulipchat.com. We just need you to do one last thing.

\n" "

Accept the Zulip Cloud terms of service

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

Diese Organisation ist auf zulipchat.com umgezogen! Du musst nur noch eine letzte Sache erledigen.

\n

Nutzungsbedingungen von Zulip akzeptieren

" #: zerver/decorator.py:135 zerver/lib/emoji.py:93 zerver/lib/users.py:77 #: zerver/lib/users.py:80 zerver/views/invite.py:28 zerver/views/invite.py:32 @@ -2916,7 +2798,7 @@ msgstr "Muss ein Administrator der Organisation sein" #: zerver/decorator.py:143 msgid "Must be a billing administrator or an organization administrator" -msgstr "" +msgstr "Muss ein Rechnungs-Administrator oder ein Organisations-Administrator sein" #: zerver/decorator.py:225 msgid "Invalid subdomain for push notifications bouncer" @@ -3004,7 +2886,7 @@ msgid "" "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:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Bitte benutze Deine echte E-Mail." @@ -3026,7 +2908,7 @@ msgstr "Bitte gib höchstens 10 Emails ein." #: zerver/forms.py:361 msgid "We couldn't find that Zulip organization." -msgstr "" +msgstr "Wir konnten diese Zulip-Organisation nicht finden." #: zerver/lib/actions.py:901 msgid "Unable to render message" @@ -3058,7 +2940,7 @@ msgstr "Beschreibung" msgid "hello" msgstr "Hallo" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3080,11 +2962,11 @@ msgstr "Ungültige Email-Adresse %s'" #: zerver/lib/actions.py:1868 zerver/lib/addressee.py:40 msgid "Invalid user ID {}" -msgstr "" +msgstr "Ungültige Nutzer-ID {}" #: zerver/lib/actions.py:2034 msgid "Reminders can only be set for streams." -msgstr "" +msgstr "Erinnerungen können nur für Streams erstellt werden." #: zerver/lib/actions.py:2040 zerver/lib/streams.py:113 #: zerver/lib/streams.py:180 @@ -3143,120 +3025,120 @@ msgstr "Widgets: Der API Programmer hat ungültiges JSON gesendet" msgid "Widgets: %s" msgstr "Widgets: %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Daten zu Mitgliedern dieses Streams nicht verfügbar" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "Kann Abonnenten für den privat Stream nicht laden" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Ungültige Standard-Streamgruppe %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' ist ein Standard-Stream und kann nicht zu '%(group_name)s' hinzugefügt werden" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "Standard-Streamgruppe '%(group_name)s' existiert bereits" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "Der Stream '%(stream_name)s' existiert bereits in der Standard-Streamgruppe '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "Der Stream '%(stream_name)s' existiert nicht in der Standard-Streamgruppe '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Diese Standard-Streamgruppe heißt bereits '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Standard-Streamgruppe '%s' existiert bereits" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "Ungültiges Flag: '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Ungültige Nachricht" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Ungültige Adresse" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Ausserhalb deiner Domain" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "E-Mail-Adressen die + enthalten sind nicht erlaubt." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Hat schon ein Konto." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "Du hast nicht genügend Einladungen zur Verfügung. Bitte kontaktiere %s um dein Limit zu erhöhen. Es wurden keine Einladungen versandt." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Dein Account ist nicht alt genug um Einladungen für diese Organisation verschicken zu können. Frage einen Organisationsadministrator, oder einen erfahreneren Nutzer." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 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:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Kann niemanden mehr einladen." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Manche der Adressen haben schon ein zugehöriges Konto, also wurden an sie keine Einladungen gesendet." -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "Ungültige Anordungs-Zuweisung" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Die Feld-ID {id} konnte nicht gefunden werden." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Nutzergruppe '%s' existiert bereits." @@ -3266,7 +3148,7 @@ msgid "Missing topic" msgstr "Thema fehlt" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Thema kann nicht leer sein" @@ -3295,9 +3177,9 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Beim Löschen des Anhangs ist ein Fehler aufgetreten. Bitte versuche es später erneut." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" -msgstr "" +msgstr "Die Nachricht muss Empfänger haben!" #: zerver/lib/domains.py:8 msgid "Domain can't be empty." @@ -3380,11 +3262,11 @@ msgstr "Stream '{stream}' existiert nicht" #: zerver/lib/exceptions.py:154 #, python-brace-format msgid "Stream with ID '{stream_id}' does not exist" -msgstr "" +msgstr "Stream mit ID '{stream_id}' existiert nicht" #: zerver/lib/exceptions.py:162 msgid "organization administrator" -msgstr "" +msgstr "Administrator der Organisation" #: zerver/lib/exceptions.py:162 msgid "user" @@ -3393,12 +3275,12 @@ msgstr "Nutzer" #: zerver/lib/exceptions.py:166 #, python-brace-format msgid "Cannot deactivate the only {entity}." -msgstr "" +msgstr "Mindestens eine/r/s {entity} muss aktiviert bleiben." #: zerver/lib/exceptions.py:177 #, python-brace-format msgid "Invalid markdown include statement: {include_statement}" -msgstr "" +msgstr "Ungültiges Markdown include-statement: {include_statement}" #: zerver/lib/exceptions.py:188 zerver/lib/request.py:159 msgid "Malformed JSON" @@ -3438,7 +3320,7 @@ msgstr "Jede Nachricht hat ein Thema. Themen machen Konversationen leicht nachvo #: zerver/lib/hotspots.py:26 msgid "Go to Settings to configure your notifications and display settings." -msgstr "" +msgstr "Gehe zu den Einstellungen um deine Benachrichtigungen und Display-Einstellungen zu konfigurieren" #: zerver/lib/hotspots.py:30 msgid "Compose" @@ -3515,26 +3397,22 @@ msgstr "Operator %s nicht unterstützt." msgid "Missing content" msgstr "Fehlender Inhalt" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" -msgstr "" +msgstr "Ungültiger GCM Parameter zum Bouncer: Priorität %r" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" -msgstr "" +msgstr "Ungültige GCM Parameter zum Bouncer: %s" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token existiert nicht" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "Der Push-Notifcation-Bouncer sendet Fehlermeldung 500" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "Push-Notification-Bouncer Fehler: %s" @@ -3542,7 +3420,7 @@ msgstr "Push-Notification-Bouncer Fehler: %s" #: zerver/lib/request.py:31 #, python-brace-format msgid "Can't decide between '{var_name1}' and '{var_name2}' arguments" -msgstr "" +msgstr "Kann nicht zwischen den Parametern '{var_name1}' und '{var_name2}' entscheiden" #: zerver/lib/request.py:42 #, python-brace-format @@ -3569,11 +3447,11 @@ msgstr "Nicht angemeldet: API-Authentifizierung oder Nutzer-Session benötigt" #: zerver/lib/streams.py:14 msgid "Please supply 'stream'." -msgstr "" +msgstr "Bitte 'stream' angeben." #: zerver/lib/streams.py:17 msgid "Please choose one: 'stream' or 'stream_id'." -msgstr "" +msgstr "Bitte wähle eins aus: 'stream' oder 'stream_id'." #: zerver/lib/streams.py:27 zerver/lib/streams.py:88 zerver/lib/streams.py:95 msgid "Invalid stream id" @@ -3595,7 +3473,7 @@ msgstr "Steam(s) (%s) existiert nicht" #: zerver/lib/streams.py:268 msgid "User cannot create a stream with these settings." -msgstr "" +msgstr "Nutzer können keinen Stream mit diesen Einstellungen erstellen." #: zerver/lib/streams.py:285 #, python-format @@ -3604,11 +3482,11 @@ msgstr "Standard-Streamgruppe mit ID '%s' existiert nicht" #: zerver/lib/upload.py:118 zerver/lib/upload.py:133 zerver/lib/upload.py:185 msgid "Could not decode image; did you upload an image file?" -msgstr "" +msgstr "Konnte das Bild nicht dekodieren; hast du eine Bilddatei hochgeladen?" #: zerver/lib/upload.py:120 zerver/lib/upload.py:135 zerver/lib/upload.py:187 msgid "Image size exceeds limit." -msgstr "" +msgstr "Bildgröße überschreitet das Limit." #: zerver/lib/upload.py:288 msgid "Upload would exceed your organization's upload quota." @@ -3722,7 +3600,7 @@ msgstr "%s ist kein Boolean" #: zerver/lib/validator.py:111 #, python-format msgid "%s is not a valid hex color code" -msgstr "" +msgstr "%s ist kein gültiger HEX Farbkode" #: zerver/lib/validator.py:125 #, python-format @@ -3811,11 +3689,11 @@ msgstr "API-Nutzungsrate überschritten" #: zerver/models.py:580 #, python-format msgid "Invalid filter pattern. Valid characters are %s." -msgstr "" +msgstr "Ungültiger Filter. Gültige Zeichen sind %s." #: zerver/models.py:596 msgid "Invalid URL format string." -msgstr "" +msgstr "Ungültiger URL-Formatierungs-String." #: zerver/models.py:1559 msgid "Unicode emoji" @@ -3918,7 +3796,7 @@ msgstr "Du bist nicht dazu authorisiert, auf diese Queue zuzugreifen" msgid "No REMOTE_USER set." msgstr "Es wurde kein REMOTE_USER eingestellt." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "Ungültiges OTP" @@ -3946,53 +3824,53 @@ msgstr "Keine Organisation in JSON Web-Token Claims angegeben" msgid "Wrong subdomain" msgstr "Ungültiger Subdomain" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Enwicklungsumgebung nicht aktiviert." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Diese Organisation wurde deaktiviert." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Dein Konto wurde deaktiviert" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Dieser Nutzer ist nicht registriert." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Passwort-Authentifizierung ist für Dein Team deaktiviert." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 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:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Entweder ist dein Benutzername oder dein Passwort falsch" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Ungültige Subdomain" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Subdomain benötigt" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID wurde nicht konfiguriert" #: zerver/views/camo.py:23 msgid "

Not a valid URL.

" -msgstr "" +msgstr "

Keine gültige URL.

" #: zerver/views/compatibility.py:77 msgid "User-Agent header missing from request" -msgstr "" +msgstr "User-Agent Header fehlt im Request." #: zerver/views/custom_profile_fields.py:35 msgid "Name cannot be blank." @@ -4018,7 +3896,7 @@ msgstr "Unbekannter Hotspot: %s" #: zerver/views/invite.py:30 msgid "Must be invited as an valid type of user" -msgstr "" +msgstr "Muss als ein gültiger Nutzer-Typ eingeladen werden" #: zerver/views/invite.py:34 msgid "You must specify at least one email address." @@ -4030,7 +3908,7 @@ msgstr "Du musst mindestens einen Stream zum abonnieren angeben" #: zerver/views/invite.py:52 msgid "Stream does not exist with id: {}. No invites were sent." -msgstr "" +msgstr "Stream mit ID: {} existiert nicht. Es wurden keine Einladungen versendet." #: zerver/views/invite.py:80 zerver/views/invite.py:83 #: zerver/views/invite.py:95 zerver/views/invite.py:98 @@ -4079,7 +3957,7 @@ msgstr "Fehlender Absender" #: zerver/views/messages.py:1260 msgid "Mirroring not allowed with recipient user IDs" -msgstr "" +msgstr "Mirroring ist nicht erlaubt mit Empfänger-Nutzer-IDs" #: zerver/views/messages.py:1270 msgid "Invalid mirrored message" @@ -4148,7 +4026,7 @@ msgstr "Keine Anwesenheitsinformationen für %s" #: zerver/views/presence.py:66 msgid "Client did not pass any new values." -msgstr "" +msgstr "Der Client hat keine neuen Werte übertragen." #: zerver/views/presence.py:86 #, python-format @@ -4204,20 +4082,20 @@ msgstr "Ungültige Domain: {}" #: zerver/views/realm.py:90 msgid "Invalid user ID: user ID cannot be empty" -msgstr "" +msgstr "Ungültige Nutzer-ID: Die Nutzer-ID darf nicht leer sein" #: zerver/views/realm.py:92 msgid "Invalid API key: API key cannot be empty" -msgstr "" +msgstr "Ungültiger API-Schlüssel: Der API-Schlüssel darf nicht leer sein" #: zerver/views/realm.py:94 msgid "Invalid API secret: API secret cannot be empty" -msgstr "" +msgstr "Ungültiges API-Geheimnis: Das API-Geheimnis darf nicht leer sein" #: zerver/views/realm.py:101 #, python-format msgid "Invalid credentials for the %(third_party_service)s API." -msgstr "" +msgstr "Ungültige Anmeldedaten für die %(third_party_service)s API." #: zerver/views/realm.py:106 msgid "Invalid bot creation policy" @@ -4225,7 +4103,7 @@ msgstr "Ungültige Richtlinie zur Erstellung von Bots" #: zerver/views/realm.py:109 msgid "Invalid email address visibility policy" -msgstr "" +msgstr "Ungültige Sichtbarkeitseinstellungen von Email-Adressen" #: zerver/views/realm_domains.py:30 #, python-format @@ -4266,11 +4144,11 @@ msgstr "Du musst genau ein Icon hochladen" #: zerver/views/realm_logo.py:17 msgid "Feature unavailable on your current plan." -msgstr "" +msgstr "Dieses Feature ist nicht verfügbar mit Deinem momentanen Abonnement" #: zerver/views/realm_logo.py:20 msgid "You must upload exactly one logo." -msgstr "" +msgstr "Du must genau ein Logo hochladen." #: zerver/views/registration.py:382 msgid "The organization creation link has expired or is not valid." @@ -4421,7 +4299,7 @@ msgstr "Ungültiges Emoji-Set '%s'" #: zerver/views/user_settings.py:175 #, python-format msgid "Invalid notification sound '%s'" -msgstr "" +msgstr "Ungültiger Benachrichtigungs-Ton: '%s'" #: zerver/views/user_settings.py:188 msgid "You must upload exactly one avatar." @@ -4433,7 +4311,7 @@ msgstr "Der einzige Administrator der Organisation ist nicht deaktivierbar" #: zerver/views/users.py:97 msgid "Guests cannot be organization administrators" -msgstr "" +msgstr "Gäste können keine Organisations-Administratoren sein" #: zerver/views/users.py:101 msgid "Cannot remove the only organization administrator" @@ -4506,7 +4384,7 @@ msgstr "Unbekannte Webhook-Anfrage" msgid "Missing required data" msgstr "Erforderliche Daten fehlen" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Inhalt kann nicht leer sein" @@ -4532,7 +4410,7 @@ msgstr "Unbekannte WordPress Webhook-Aktion:" #: zerver/webhooks/zabbix/view.py:41 msgid "Invalid payload" -msgstr "" +msgstr "Ungültige Payload" #. error #: zilencer/views.py:30 @@ -4552,8 +4430,8 @@ msgstr "%s ist kein gültiger Hostname" #: zilencer/views.py:158 #, python-format msgid "Invalid property %s" -msgstr "" +msgstr "Ungültige Eigenschaft %s" #: zilencer/views.py:160 msgid "Data is out of order." -msgstr "" +msgstr "Die Daten sind nicht in Ordnung." diff --git a/static/locale/de/translations.json b/static/locale/de/translations.json index 1268ac4f6a..69527fefb9 100644 --- a/static/locale/de/translations.json +++ b/static/locale/de/translations.json @@ -80,7 +80,7 @@ "Are invitations required for joining the organization?": "Werden Einladungen benötigt um der Organisation beizutreten?", "Are you sure you want to create stream '__stream_name__' and subscribe __count__ users to it?": "Bist Du sicher, dass Du den Stream '__stream_name__' mit __count__ Nutzern erstellen möchtest?", "Are you sure you want to delete __group_name__?": "Bist Du sicher, dass du __group_name__ löschen möchtest?", - "Are you sure you want to delete all messages in __topic_name__?": "", + "Are you sure you want to delete all messages in __topic_name__?": "Bist du sicher, das du all Nachrichten im __topic_name__löschen möchtest?", "Are you sure you want to do this?": "Bist Du sicher, dass Du das machen möchtest?", "Are you sure you want to mention all __count__ people in this stream?": "Bist Du sicher, dass Du allen __count__ Benutzern in diesem Stream eine Nachricht senden möchtest?", "Are you sure you want to resend the invitation to ?": "Bist Du sicher, dass Du erneut eine Einladung an versenden willst?", @@ -156,7 +156,7 @@ "Deactivated users": "Deaktivierte Nutzer", "Deactivation encountered an error. Please reload and try again.": "Bei der Deaktivierung ist ein Fehler aufgetreten. Bitte lade die Seite neu und versuche es nochmal.", "Default language": "Standardsprache", - "Default settings for new users joining this organization.": "", + "Default settings for new users joining this organization.": "Standardeinstellungen für neue Nutzer die dieser Organisation beitreten.", "Default streams": "Standardstreams", "Default user settings": "Standardnutzereinstellungen", "Delete": "Löschen", @@ -169,7 +169,7 @@ "Delete icon": "Icon löschen", "Delete logo": "Logo löschen", "Delete message": "Nachricht löschen", - "Delete messages": "", + "Delete messages": "Nachricht löschen", "Delete stream": "Stream löschen", "Delete topic": "Thema löschen", "Delete user group": "Nutzergruppe löschen", @@ -246,9 +246,9 @@ "Forgotten it?": "Passwort vergessen?", "Formatting": "Formatierung", "Full name": "Vollständiger Name", - "Generate invite link": "", + "Generate invite link": "erstelle Einladungs Link", "Generate new API key": "Neuen API-Schlüssel generieren", - "Generating link...": "", + "Generating link...": "Erstelle Link...", "Generic": "Standard", "Get API key": "Hole API Schlüssel", "Go back": "Zurückgehen", @@ -268,7 +268,7 @@ "Interface": "Interface", "Invalid slash command. Check if you are missing a space after the command.": "Ungültigerr Slash-Befehl. Überprüfe, ob nach dem Befehl ein Leerzeichen fehlt.", "Invalid stream id": "Ungültige Stream-ID", - "Invitation link: __link__": "", + "Invitation link: __link__": "Einladungs Link: __link__", "Invitations": "Einladungen", "Invite": "Einladen", "Invite more users": "Lade neue Benutzer ein", @@ -397,7 +397,7 @@ "Organization settings": "Einstellungen der Organisation", "Other notification settings": "Andere Benachrichtigungseinstellungen", "Other permissions": "Andere Berechtigungen", - "Other settings": "", + "Other settings": "Andere Einstellung", "Outgoing webhook message format": "Outgoing Webhook Nachrichtenformat", "Owner": "Besitzer", "Password": "Passwort", @@ -456,6 +456,7 @@ "Search results": "Suchergebnisse", "Search subscribers": "Abonnenten suchen", "Search uploads...": "Datei suchen...", + "Searched for:": "Gesucht nach:", "See the rest of this message": "Zeige den Rest der Nachricht", "Select date and time": "Datum und Zeit auswählen", "Select default language": "Standardsprache auswählen", @@ -593,7 +594,7 @@ "Visual desktop notifications": "Visuelle Desktop-Benachrichtigungen", "Warning: __stream_name__ is a private stream.": "Achtung: __stream_name__ ist ein privater Stream.", "We are about to have a poll. Please wait for the question.": "Wir haben gleich eine Umfrage. Bitte warte auf die Frage.", - "We recommend against deleting topics unless needed for security reasons or managing abuse. Deleted messages can be confusing for users who may later visit the topic via notifications.": "", + "We recommend against deleting topics unless needed for security reasons or managing abuse. Deleted messages can be confusing for users who may later visit the topic via notifications.": "Wir empfehlen, keine Themen zu löschen, es sei denn aus Sicherheitsgründen oder um Missbrauch einzudämmen. Gelöschte Nachrichten können verwirrend für andere Nutzer sein, wenn sie versuchen, das Thema über eine Benachrichtigung zu öffnen.", "Who can add bots": "Wer kann Bots hinzufügen", "Who can add custom emoji": "Wer kann eigene Emojis hinzufügen", "Who can create streams": "Wer kann Streams erstellen", diff --git a/static/locale/es/LC_MESSAGES/django.po b/static/locale/es/LC_MESSAGES/django.po index 6b718b1f2e..560de5944d 100644 --- a/static/locale/es/LC_MESSAGES/django.po +++ b/static/locale/es/LC_MESSAGES/django.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" -"Last-Translator: Yago González \n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+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" @@ -294,8 +294,8 @@ msgstr "Registrarse" msgid "OR" msgstr "O" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Registrarse con %(identity_provider)s" @@ -450,7 +450,7 @@ msgid "Are you sure you want to delete this message?" msgstr "¿Seguro que deseas eliminar este mensaje?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Cancelar" @@ -599,11 +599,11 @@ msgid "" " " msgstr "\nAprende más sobre las menciones aquí." -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "¡Nadie ha hablado de eso todavía!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Mensajes" @@ -635,48 +635,48 @@ msgstr "Intenta ahora." msgid "Invite users to Zulip" msgstr "Invitar usuarios a Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Direcciones de correo (una en cada línea o separadas por comas)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Una o más direcciones de correo electrónico..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Añadir usuario(s) como" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Miembros" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Administradores de la organización" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Canales a los que deberían unirse" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Invitando..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Invitar" @@ -742,7 +742,7 @@ msgid "Navigation" msgstr "Navegación" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Buscar canales" @@ -944,7 +944,7 @@ msgstr "Suscribir, añadir, o configurar canales" msgid "Filter streams" msgstr "Filtrar canales" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Todos los canales" @@ -1144,14 +1144,14 @@ msgstr "Filtrar usuarios" msgid "USERS" msgstr "USUARIOS" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Invitar a más usuarios" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "MENSAJES PRIVADOS GRUPALES" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Invitar a más usuarios" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operador" @@ -1429,37 +1429,37 @@ msgstr "Usuarios invitados" msgid "Normal users" msgstr "Usuarios normales" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Confirmar cambio de correo" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1474,48 +1474,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Completar registro" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Puedes iniciar sesión en tu organización de Zulip, %(realm_name)s, con el siguiente enlace:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "La dirección de correo electrónico asociada a tu cuenta es %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Si estás teniendo problemas para iniciar sesión, por favor, contacta con el soporte de Zulip respondiendo a este correo." +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1528,83 +1530,81 @@ msgid "Welcome to Zulip!" msgstr "¡Bienvenido a Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Saludos," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1613,14 +1613,14 @@ msgstr "Saludos," msgid "Team Zulip" msgstr "El equipo de Zulip" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1672,7 +1672,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1688,7 +1688,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1708,14 +1708,14 @@ msgstr "Hola, ¿qué tal?" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1727,17 +1727,16 @@ msgstr "" msgid "Hi again," msgstr "Hola de nuevo:" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1767,10 +1766,11 @@ msgid "Best," msgstr "Saludos," #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1779,178 +1779,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Reestablecer contraseña" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1998,35 +1977,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2246,24 +2193,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2297,14 +2226,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2314,24 +2235,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2348,27 +2251,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2992,7 +2874,7 @@ msgid "" "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:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Por favor, usa tu dirección de correo electrónico real." @@ -3046,7 +2928,7 @@ msgstr "Descripción" msgid "hello" msgstr "hola" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3131,120 +3013,120 @@ msgstr "Widgets: el programador de la API envió contenido JSON inválido" msgid "Widgets: %s" msgstr "Widgets: %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Los datos sobre los suscriptores no están disponibles en este canal" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "No se puede recopilar los suscriptores para un canal privado" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Grupo de canales por defecto %s inválido" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' es un canal por defecto y no puede ser añadido a '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "El grupo de canales por defecto '%(group_name)s' ya existe" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "El canal '%(stream_name)s' ya está en el grupo de canales por defecto '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "El canal '%(stream_name)s' no está en el grupo de canales por defecto '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Este grupo de canales por defecto ya se llama '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "El grupo de canales por defecto '%s' ya existe" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "Etiqueta inválida: '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Mensaje(s) inválido(s)" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Dirección inválida." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Fuera de tu dominio." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "Las direcciones de correo electrónico que contienen símbolos + no están permitidas." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Ya tiene una cuenta." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "No te quedan suficientes invitaciones. Por favor, contacta con %s para que te aumenten el límite. No se envió ninguna invitación." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Tu cuenta es demasiado nueva para enviar invitaciones en esta organización. Pídeselo a un administrador de la organización, o a un usuario con más experiencia." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 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:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "No hemos podido invitar a nadie." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Algunas de esas direcciones ya están usando Zulip, por lo que no les hemos enviado una invitación. ¡Enviamos invitaciones a todos los demás!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "Orden del mapeo inválido." -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Id de campo {id} no encontrado." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "El grupo de usuarios '%s' ya existe." @@ -3254,7 +3136,7 @@ msgid "Missing topic" msgstr "Falta el tema" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "El tema no puede estar vacío" @@ -3283,7 +3165,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Un error ocurrió al eliminar el adjunto. Por favor, inténtalo de nuevo más adelante." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3503,26 +3385,22 @@ msgstr "Operador %s no soportado." msgid "Missing content" msgstr "Falta el contenido" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "El token no existe" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "Se recibió un 500 del bouncer de notificaciones push" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "Error del bouncer de notificaciones push: %s" @@ -3906,7 +3784,7 @@ msgstr "No estás autorizado a acceder a esta cola" msgid "No REMOTE_USER set." msgstr "No hay REMOTE_USER establecido." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "OTP inválida" @@ -3934,43 +3812,43 @@ msgstr "No se ha especificado ninguna organización en las declaraciones del tok msgid "Wrong subdomain" msgstr "Subdominio erróneo" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Entorno de desarrollo no activado." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Esta organización ha sido desactivada." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Tu cuenta ha sido desactivada." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Este usuario no está registrado." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "La autentificación por contraseña está desactivada en tu equipo." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 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:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Tu nombre de usuario o contraseña es incorrecto." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Subdominio inválido" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Subdominio requerido" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID no está configurado" @@ -4494,7 +4372,7 @@ msgstr "Petición webhook desconocida" msgid "Missing required data" msgstr "Faltan datos requeridos" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "El contenido no puede estar vacío" diff --git a/static/locale/es/translations.json b/static/locale/es/translations.json index c6cd7f70bd..a6682e4d96 100644 --- a/static/locale/es/translations.json +++ b/static/locale/es/translations.json @@ -456,6 +456,7 @@ "Search results": "Resultados de búsqueda", "Search subscribers": "Buscar suscriptores", "Search uploads...": "Buscar subidas...", + "Searched for:": "", "See the rest of this message": "Ver el resto de este mensaje", "Select date and time": "Seleccionar fecha y hora", "Select default language": "Seleccionar idioma por defecto", diff --git a/static/locale/fi/LC_MESSAGES/django.po b/static/locale/fi/LC_MESSAGES/django.po index df367a6a73..d8a9566f3b 100644 --- a/static/locale/fi/LC_MESSAGES/django.po +++ b/static/locale/fi/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Finnish (http://www.transifex.com/zulip/zulip/language/fi/)\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ msgstr "Rekisteröidy" msgid "OR" msgstr "TAI" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Rekisteröidy käyttäen tarjoajaa %(identity_provider)s" @@ -446,7 +446,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Oletko varma, että haluat poistaa tämän viestin?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Peruuta" @@ -595,11 +595,11 @@ msgid "" " " msgstr "\n Opi lisää mainitsemisesta \n täältä.\n " -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Kukaan ei ole vielä puhunut siitä!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -631,48 +631,48 @@ msgstr "Yritä nyt." msgid "Invite users to Zulip" msgstr "Kutsu käyttäjiä Zulipiin" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Sähköpostit (yksi per rivi tai pilkulla erotettuina)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Yksi tai useampi sähköpostiosoite..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Käyttäjäryhmä johon käyttäjä(t) liittyy" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Jäsenet" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Organisaation järjestelmänvalvojat" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Kanavat joihin heidän pitäisi liittyä" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Kutsutaan..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Kutsu" @@ -738,7 +738,7 @@ msgid "Navigation" msgstr "Navigointi" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Etsi kanavia" @@ -940,7 +940,7 @@ msgstr "Tilaa, lisää, tai konfiguroi kanavia" msgid "Filter streams" msgstr "Suodata kanavia" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Kaikki kanavat" @@ -1140,14 +1140,14 @@ msgstr "Suodata käyttäjiä" msgid "USERS" msgstr "KÄYTTÄJÄT" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Kutsu lisää käyttäjiä" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "RYHMÄ-YV:t" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Kutsu lisää käyttäjiä" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operaattori" @@ -1425,37 +1425,37 @@ msgstr "Vieraskäyttäjät" msgid "Normal users" msgstr "Normaalit käyttäjät" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Vahvista sähköpostin vaihto" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1470,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Vie rekisteröinti päätökseen" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Voit kirjautua Zulip-organisaatioosi %(realm_name)s osoitteessa:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "Tiliisi liitetty sähköpostiosoite on %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Jos sinulla on vaikeuksia kirjautua, ota yhteyttä Zulip-tukeen vastaamalla tähän sähköpostiin." +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1526,81 @@ msgid "Welcome to Zulip!" msgstr "" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Terveisin," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1609,14 @@ msgstr "Terveisin," msgid "Team Zulip" msgstr "Zulip-tiimi" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1668,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1684,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1704,14 @@ msgstr "Heippa," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1723,16 @@ msgstr "" msgid "Hi again," msgstr "Hei taas," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1762,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1775,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Aseta uusi salasana" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1973,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2189,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2222,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2231,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2247,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2870,7 @@ msgid "" "to register for accounts in this organization." msgstr "Sähköposti osoite, {email}, ei ole verkkotunnuksesta joista on sallittu rekisteröityminen tähän organisaatioon." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Ole hyvä ja käytä oikeaa sähköpostiosoitetta." @@ -3042,7 +2924,7 @@ msgstr "Kuvaus" msgid "hello" msgstr "moi" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3009,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Tilaajatietoja ei ole saatavilla tälle kanavalle" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Virheellinen oletuskanavan ryhmä %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' on oletuskanava ja sitä ei voi lisätä '%(group_name)s' ryhmään" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "Oletuskanavan ryhmä '%(group_name)s' on jo olemassa" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "'%(stream_name)s' kanava on jo oletuskanavan ryhmässä '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "'%(stream_name)s' kanava ei ole oletuskanavan ryhmässä '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Tämä oletuskanavan ryhmä on jo nimetty '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Oletuskanavan ryhmä '%s' on jo olemassa" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Virheellinen viesti(t)" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Virheellinen osoite." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Verkkotunnuksesi ulkopuolella." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Omistaa jo tilin." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "Sinulla ei ole tarpeeksi kutsuja jäljellä. Ole hyvä ja ota yhteyttä %ssaadaksesi lisää kutsuja. Yhtään kutsua ei lähetetty." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Tilisi on liian uusi jotta voisit lähettää kutsuja tähän organisaatioon. Kysy organisaation järjestelmänvalvojalta tai kokeneemmalta käyttäjältä." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Joitain sähköposteja ei saatu vahvistettua, joten yhtään kutsua ei lähetetty." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Emme kyenneet kutsumaan ketään." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Jotkut osoitteista käyttää jo Zulipia, joten heille ei lähetetty kutsua. Muille kutsut lähetettiin!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Kenttä id {id} ei löydy." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Käyttäjäryhmä '%s' on jo olemassa." @@ -3250,7 +3132,7 @@ msgid "Missing topic" msgstr "Puuttuva aihe" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Aihe ei voi olla tyhjä" @@ -3279,7 +3161,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Virhe tapahtui liitettä poistettaessa. Ole hyvä ja yritä myöhemmin uudelleen." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3499,26 +3381,22 @@ msgstr "%soperaatio ei ole tuettu." msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token ei ole olemassa" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "500 vastaanotettu pikailmoitusten ohjaajalta" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "Pikailmoitusten ohjaajan vika: %s" @@ -3902,7 +3780,7 @@ msgstr "Et ole valtuutettu käyttämään tätä jonoa" msgid "No REMOTE_USER set." msgstr "REMOTE_USERia ei ole asetettu." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "Virheellinen OTP" @@ -3930,43 +3808,43 @@ msgstr "Organisaatiota ei ole määritelty JSON web token -väitteissä" msgid "Wrong subdomain" msgstr "Väärä aliverkkotunnus" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Kehitysympäristö ei ole käytössä." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Tämä organisaatio on deaktivoitu." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Tilisi on poistettu käytöstä." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Tätä käyttäjää ei ole rekisteröity." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Tiimilläsi ei ole salasanatodennus käytössä." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Tätä käyttäjää ei ole rekisteröity; tee se selaimella." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Sinun käyttäjätunnus tai salasana on väärin." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Virheellinen aliverkkotunnus" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Aliverkkotunnus vaaditaan" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID ei ole konfiguroitu" @@ -4490,7 +4368,7 @@ msgstr "Tuntematon webhook pyyntö" msgid "Missing required data" msgstr "Puuttuvat vaaditut tiedot" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Sisältö ei voi olla tyhjä" diff --git a/static/locale/fi/translations.json b/static/locale/fi/translations.json index 85ff34aa78..0798bfccd9 100644 --- a/static/locale/fi/translations.json +++ b/static/locale/fi/translations.json @@ -456,6 +456,7 @@ "Search results": "Hakutulokset", "Search subscribers": "Etsi tilaajia", "Search uploads...": "Etsi latauksia...", + "Searched for:": "", "See the rest of this message": "Näe loput viestistä", "Select date and time": "Valitse päiväys ja aika", "Select default language": "Valitse oletuskieli", diff --git a/static/locale/fr/LC_MESSAGES/django.po b/static/locale/fr/LC_MESSAGES/django.po index f59f2572b4..6ea37185d4 100644 --- a/static/locale/fr/LC_MESSAGES/django.po +++ b/static/locale/fr/LC_MESSAGES/django.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" -"Last-Translator: Alexandre de Lespinasse \n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+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" @@ -302,8 +302,8 @@ msgstr "S'inscrire" msgid "OR" msgstr "OU" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "S'inscrire avec %(identity_provider)s" @@ -458,7 +458,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Etes-vous sur de vouloir supprimer ce message?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Annuler" @@ -607,11 +607,11 @@ msgid "" " " msgstr "\n Apprenez-en plus à propos des mentions \n ici .\n " -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Personne n'a encore parlé de cela !" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Messages" @@ -643,48 +643,48 @@ msgstr "Essayer maintenant." msgid "Invite users to Zulip" msgstr "Inviter des utilisateurs à Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Courriels (sur chaque ligne ou séparés par une virgule)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Un ou plusieurs courriels…" -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Le(s) utilisateur(s) a rejoint en tant que" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Membres" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Administrateurs de l'organisation" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Canaux qu'ils devraient rejoindre" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "En cours d'invitation…" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Inviter" @@ -750,7 +750,7 @@ msgid "Navigation" msgstr "Navigation" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Rechercher des canaux" @@ -952,7 +952,7 @@ msgstr "S'abonner, ajouter, ou configurer les canaux" msgid "Filter streams" msgstr "Filtrer les canaux" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Tous les canaux" @@ -1152,14 +1152,14 @@ msgstr "Filtrer les utilisateurs" msgid "USERS" msgstr "UTILISATEURS" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Inviter d'autres utilisateurs" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "MP DE GROUPE " +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Inviter d'autres utilisateurs" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Opérateur" @@ -1437,37 +1437,37 @@ msgstr "Utilisateurs invités" msgid "Normal users" msgstr "Utilisateurs normaux" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Confirmer la modification de l'adresse email" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1482,48 +1482,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Compléter votre inscription" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Vous pouvez vous connecter sur votre organisation Zulip, %(realm_name)s,\nen cliquant sur le lien suivant:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "L’adresse email associée à ce compte est %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Si vous rencontrez des difficultés pour vous connecter, contacter l'équipe du support de Zulip en répondant à\nce mail." +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1536,83 +1538,81 @@ msgid "Welcome to Zulip!" msgstr "Bienvenue sur Zulip !" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "Détails de votre compte :" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "URL de l'organisation :" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "Nom d'utilisateur :" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "Utiliser votre compte LDAP pour vous connecter" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "Courriel :" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Bravo," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1621,14 +1621,14 @@ msgstr "Bravo," msgid "Team Zulip" msgstr "L'équipe Zulip" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1680,7 +1680,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1696,7 +1696,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1716,14 +1716,14 @@ msgstr "Salut," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1735,17 +1735,16 @@ msgstr "" msgid "Hi again," msgstr "Rebonjour," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1775,10 +1774,11 @@ msgid "Best," msgstr "Cher," #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1787,178 +1787,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "Sécurité de Zulip" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "Se désabonner des notifications de connexion" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "Cliquer sur le bouton ci-dessous pour réinitialiser votre mot de passe." -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Réinitialiser le mot de passe" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "Réactiver l'organisation" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -2006,35 +1985,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2254,24 +2201,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2305,14 +2234,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2322,24 +2243,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2356,27 +2259,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -3000,7 +2882,7 @@ msgid "" "to register for accounts in this organization." msgstr "Votre courriel, {email}, n'est pas dans un des domaines autorisés à s'inscrire pour les comptes de cette organisation." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Merci d'utiliser votre véritable courriel." @@ -3054,7 +2936,7 @@ msgstr "Description" msgid "hello" msgstr "salut" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3139,120 +3021,120 @@ msgstr "" msgid "Widgets: %s" msgstr "Widgets: %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Les données de l'abonné à ce canal ne sont pas disponibles" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "Impossible de retrouver la liste des abonnés pour ce canal privé" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Le canal de groupe par défaut '%s' existe déjà" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "Flag non valide '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Message(s) invalide(s)" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Courriel invalide." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "En-dehors de votre domaine." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "Les adresses mail contenant un + ne sont pas autorisées." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Possède déjà un compte." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Votre inscription est trop récente pour que vous puissiez inviter des personnes à rejoindre cette organisation. Merci de demander à un administrateur de cette organisation, ou à un utilisateur plus ancien." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 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:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Nous n'avons pas été capable d'inviter quelqu’un." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Certaines de ces adresses utilisent déjà Zulip, nous ne leurs avons donc pas envoyé d'invitation. Nous avons bien sûr envoyé des invitations à toutes les autres personnes!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "Ordre de mappage non valide." -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Champ id {id} introuvable. " -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Le groupe d'utilisateur '%s' existe déjà." @@ -3262,7 +3144,7 @@ msgid "Missing topic" msgstr "Sujet manquant" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Le sujet ne peut pas être vide" @@ -3291,7 +3173,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Une erreur est survenue pendant la suppression de la pièce-jointe. Merci de réessayer plus tard." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3511,26 +3393,22 @@ msgstr "Opérateur %s non supporté." msgid "Missing content" msgstr "Contenu manquant" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Le jeton n'existe pas." -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3914,7 +3792,7 @@ msgstr "Vous n'avez pas l'autorisation d'accéder à cette queue" msgid "No REMOTE_USER set." msgstr "Pas de REMOTE_USER configuré." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "OTP invalide" @@ -3942,43 +3820,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "Mauvais sous-domaine" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Environnement de dev non activé." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Cette organisation a été désactivée." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Votre compte a été désactivé" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Cet utilisateur n'est pas inscrit." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Authentification par mot de passe est désactivée pour votre équipe." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Cet utilisateur n'est pas enregistré; faite le à partir d'un navigateur." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Votre nom d'utilisateur ou mot de passe est incorrect." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Sous-domaine invalide" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Sous-domaine requis" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "Le GOOGLE_CLIENT_ID n'est pas configuré" @@ -4502,7 +4380,7 @@ msgstr "Requête webhook inconnue" msgid "Missing required data" msgstr "Des données obligatoires requises sont manquantes" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Le contenu ne peut être vide" diff --git a/static/locale/fr/translations.json b/static/locale/fr/translations.json index 07146e9cf7..5440e28697 100644 --- a/static/locale/fr/translations.json +++ b/static/locale/fr/translations.json @@ -456,6 +456,7 @@ "Search results": "Résultats de la recherche", "Search subscribers": "Rechercher des abonnés", "Search uploads...": "Recherche de téléchargements...", + "Searched for:": "", "See the rest of this message": "Voir le reste de ce message", "Select date and time": "Sélectioner une date et une heure", "Select default language": "Sélectionner la langue par défaut", diff --git a/static/locale/gl/LC_MESSAGES/django.po b/static/locale/gl/LC_MESSAGES/django.po index f25e61b442..206b137112 100644 --- a/static/locale/gl/LC_MESSAGES/django.po +++ b/static/locale/gl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-12 00:49+0000\n" +"POT-Creation-Date: 2019-02-27 00:30+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -289,8 +289,8 @@ msgstr "" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -592,17 +592,16 @@ msgstr "" #: templates/zerver/app/home.html:138 msgid "" "\n" -" Learn more about mentions \n" +" Learn more about mentions \n" " here.\n" " " msgstr "" #: templates/zerver/app/home.html:145 -msgid "Nobody has talked about that yet!" +msgid "No search results" msgstr "" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -741,7 +740,7 @@ msgid "Navigation" msgstr "" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "" @@ -943,7 +942,7 @@ msgstr "" msgid "Filter streams" msgstr "" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "" @@ -980,7 +979,7 @@ msgstr "" msgid "You get" msgstr "" -#: templates/zerver/app/markdown_help.html:107 +#: templates/zerver/app/markdown_help.html:112 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first __count__ people in this stream?": "", "Are you sure you want to resend the invitation to ?": "", - "Are you sure you want to revoke the invitation to ?": "", + "Are you sure you want to revoke the invitation to __email__?": "", + "Are you sure you want to revoke this invitation link created by __referred_by__?": "", "Attach files": "", "Attachment deleted": "", "Audible desktop notifications": "", @@ -116,7 +117,6 @@ "Check all": "", "Choose avatar": "", "Choose custom color": "", - "Clear": "", "Clear avatar": "", "Clear emoji image": "", "Click anywhere on a message to reply.": "", @@ -191,7 +191,7 @@ "Download file": "", "Download zuliprc": "", "Drafts": "", - "Drafts older than __draft_lifetime__ days are automatically removed": "", + "Drafts older than __draft_lifetime__ days are automatically removed.": "", "EDITED": "", "Edit": "", "Edit bot": "", @@ -271,9 +271,9 @@ "Invitation link: __link__": "", "Invitations": "", "Invite": "", + "Invite link": "", "Invite more users": "", "Invited as": "", - "Invited as administrator": "", "Invited at": "", "Invited by": "", "Invites": "", @@ -289,6 +289,7 @@ "Last active": "", "Last modified": "", "Last seen": "", + "Like Organization logo, but for the night theme.": "", "Linkifiers": "", "Local time": "", "Looking for our Integrations or API documentation?": "", @@ -391,6 +392,7 @@ "Organization avatar": "", "Organization description": "", "Organization logo": "", + "Organization logo for night mode": "", "Organization name": "", "Organization permissions": "", "Organization profile": "", @@ -419,6 +421,7 @@ "Preview": "", "Preview profile": "", "Private messages and @-mentions": "", + "Pro tip: You can use 'd' to open your drafts.": "", "Profile": "", "Profile field settings": "", "Quote and reply": "", @@ -442,7 +445,8 @@ "Restrict to a list of domains": "", "Retry": "", "Revoke": "", - "Revoke invitation to ": "", + "Revoke invitation link": "", + "Revoke invitation to __email__": "", "Revoke now": "", "Role": "", "Save": "", @@ -470,8 +474,8 @@ "Sent! Your message was sent to a topic you have muted.": "", "Sent! Your recent message is outside the current search.": "", "Set a status message": "", - "Set yourself to active": "", - "Set yourself to away": "", + "Set yourself as active": "", + "Set yourself as unavailable": "", "Settings": "", "Setup": "", "Setup two factor authentication": "", @@ -512,6 +516,7 @@ "The email will be forwarded to this stream": "", "The recipient __recipient__ is not valid": "", "The recipients __recipients__ are not valid": "", + "The stream description cannot contain newline characters.": "", "The stream description has been updated!": "", "The stream has been renamed!": "", "Their password will be cleared from our systems, and any bots they maintain will be disabled.": "", @@ -582,13 +587,13 @@ "Video chat provider": "", "View edit history": "", "View file": "", + "View full profile": "", "View messages sent": "", "View private messages": "", "View private messages to myself": "", "View source": "", "View source / Edit topic": "", "View stream": "", - "View user profile": "", "View your profile": "", "Visual desktop notifications": "", "Warning: __stream_name__ is a private stream.": "", @@ -621,6 +626,7 @@ "You have nothing to send!": "", "You must be an organization administrator to create a stream without subscribing.": "", "You need to be running Zephyr mirroring in order to send messages!": "", + "You searched for:": "", "You subscribed to stream __stream__": "", "You unsubscribed from stream __stream__": "", "You're not subscribed to this stream. You will not be notified if other users reply to your message.": "", @@ -642,6 +648,7 @@ "__starred_status__ this message": "", "__wildcard_mention_token__ (Notify stream)": "", "and": "", + "clear": "", "cookie": "", "group private messages with __recipient__": "", "in 1 hour": "", diff --git a/static/locale/hi/LC_MESSAGES/django.po b/static/locale/hi/LC_MESSAGES/django.po index c91ee249b7..f667a0f8fb 100644 --- a/static/locale/hi/LC_MESSAGES/django.po +++ b/static/locale/hi/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Hindi (http://www.transifex.com/zulip/zulip/language/hi/)\n" "MIME-Version: 1.0\n" @@ -292,8 +292,8 @@ msgstr "साइन अप करें" msgid "OR" msgstr "या" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "इसके साथ साइन अप करें %(identity_provider)s" @@ -448,7 +448,7 @@ msgid "Are you sure you want to delete this message?" msgstr "क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "रद्द करना" @@ -597,11 +597,11 @@ msgid "" " " msgstr "\nउल्लेख के बारे में अधिक जानें\n यहाँ।" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "उस बारे में अभी तक किसी ने बात नहीं की है!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "संदेश" @@ -633,48 +633,48 @@ msgstr "अब कोशिश करो।" msgid "Invite users to Zulip" msgstr "उपयोगकर्ताओं को जूलिप के लिए आमंत्रित करें" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "ईमेल (प्रत्येक पंक्ति पर एक या अल्पविराम से अलग)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "एक या अधिक ईमेल पते ..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "उपयोगकर्ता (ओं) के रूप में शामिल हों" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "सदस्य" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "संगठन प्रशासक" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "धाराएं उन्हें जुड़नी चाहिए" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "को आमंत्रित करें ..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "आमंत्रण" @@ -740,7 +740,7 @@ msgid "Navigation" msgstr "पथ प्रदर्शन" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "धाराएँ खोजें" @@ -942,7 +942,7 @@ msgstr "" msgid "Filter streams" msgstr "" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "सभी धारा" @@ -1142,12 +1142,12 @@ msgstr "" msgid "USERS" msgstr "" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" +#: templates/zerver/app/right_sidebar.html:28 +msgid "GROUP PMs" msgstr "" -#: templates/zerver/app/right_sidebar.html:31 -msgid "GROUP PMs" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" msgstr "" #: templates/zerver/app/search_operators.html:7 @@ -1427,37 +1427,37 @@ msgstr "" msgid "Normal users" msgstr "सामान्य उपयोगकर्ता" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1472,48 +1472,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1526,83 +1528,81 @@ msgid "Welcome to Zulip!" msgstr "" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1611,14 +1611,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1670,7 +1670,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1686,7 +1686,7 @@ msgid "Zulip" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1706,14 +1706,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1725,17 +1725,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1765,10 +1764,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1777,178 +1777,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1996,35 +1975,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2244,24 +2191,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2295,14 +2224,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2312,24 +2233,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2346,27 +2249,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2990,7 +2872,7 @@ msgid "" "to register for accounts in this organization." msgstr "आपका ईमेल पता, {email}, उन डोमेन में से एक नहीं है, जिन्हें इस संगठन में खातों के लिए पंजीकरण करने की अनुमति है।" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3044,7 +2926,7 @@ msgstr "विवरण" msgid "hello" msgstr "" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3129,120 +3011,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "इस संगठन के लिए आमंत्रण भेजने के लिए आपका खाता बहुत नया है। एक संगठन व्यवस्थापक, या एक अधिक अनुभवी उपयोगकर्ता से पूछें।" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "कुछ ईमेल मान्य नहीं हुए, इसलिए हमने कोई निमंत्रण नहीं भेजा।" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "हम किसी को भी आमंत्रित करने में सक्षम नहीं थे।" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "उनमें से कुछ पते पहले से ही ज़ूलिप का उपयोग कर रहे हैं, इसलिए हमने उन्हें निमंत्रण नहीं भेजा। हमने सभी को निमंत्रण भेजा!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "अमान्य ऑर्डर मैपिंग।" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3252,7 +3134,7 @@ msgid "Missing topic" msgstr "" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "" @@ -3281,7 +3163,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "कुर्की हटाते समय एक त्रुटि हुई। बाद में पुन: प्रयास करें।" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3501,26 +3383,22 @@ msgstr "" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3904,7 +3782,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3932,43 +3810,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -4492,7 +4370,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "" diff --git a/static/locale/hi/translations.json b/static/locale/hi/translations.json index ac22ee6c2b..c97aa46a75 100644 --- a/static/locale/hi/translations.json +++ b/static/locale/hi/translations.json @@ -456,6 +456,7 @@ "Search results": "", "Search subscribers": "", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "", "Select date and time": "", "Select default language": "", diff --git a/static/locale/hu/LC_MESSAGES/django.po b/static/locale/hu/LC_MESSAGES/django.po index 3e63958938..7453f93d23 100644 --- a/static/locale/hu/LC_MESSAGES/django.po +++ b/static/locale/hu/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Hungarian (http://www.transifex.com/zulip/zulip/language/hu/)\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ msgstr "Feliratkozás" msgid "OR" msgstr "VAGY" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Regisztráció %(identity_provider)s segítségével" @@ -446,7 +446,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Biztosan törlöd ezt az üzenetet?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Mégse" @@ -595,11 +595,11 @@ msgid "" " " msgstr "\nTudj meg többet az említésekről \nitt." -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Erről még nem beszélt senki!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -631,48 +631,48 @@ msgstr "Most próbáld!" msgid "Invite users to Zulip" msgstr "Felhasználók meghívása a Zulip-ba" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "E-mail-ek (egyet egy sorba, vagy vesszővel elválasztva)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Egy vagy több e-mail cím..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Felhasználók csatlakoznak, mint" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Tagok" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Szervezeti adminisztrátorok" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Üzenetfolyamok, amelyekhez csatlakozniuk kellene" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Meghívás..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Meghívás" @@ -738,7 +738,7 @@ msgid "Navigation" msgstr "Navigáció" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Keresés az üzenetfolyamokban" @@ -940,7 +940,7 @@ msgstr "Üzenetfolyamok hozzáadása, beállítása vagy feliratkozás" msgid "Filter streams" msgstr "Üzenetfolyamok szűrése" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Minden üzenetfolyam" @@ -1140,12 +1140,12 @@ msgstr "Felhasználók szűrése" msgid "USERS" msgstr "" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" +#: templates/zerver/app/right_sidebar.html:28 +msgid "GROUP PMs" msgstr "" -#: templates/zerver/app/right_sidebar.html:31 -msgid "GROUP PMs" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" msgstr "" #: templates/zerver/app/search_operators.html:7 @@ -1425,37 +1425,37 @@ msgstr "" msgid "Normal users" msgstr "Normál felhasználók" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1470,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1526,81 @@ msgid "Welcome to Zulip!" msgstr "Üdvözlünk a Zulipban!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1609,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1668,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1684,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1704,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1723,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1762,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1775,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1973,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2189,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2222,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2231,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2247,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2870,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3042,7 +2924,7 @@ msgstr "Leírás" msgid "hello" msgstr "" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3009,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Ennél az üzenetfolyamnál nem érhetők el a feliratkozók adatai." -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "Privát üzenetfolyamnál nem érhetők el a feliratkozók adatai." -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Hibás alapértelmezett üzenetfolyam csoport %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' alapértelmezett üzenetfolyam, ezért nem adható hozzá ehhez: '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "A(z) '%(group_name)s' alapértelmezett üzenetfolyam már létezik!" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "A(z) '%(stream_name)s' üzenetfolyam már létezik a(z) '%(group_name)s' alapértelmezett üzenetfolyam csoportban!" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "A(z) '%(stream_name)s' üzenetfolyam nincs benne a(z) '%(group_name)s' alapértelmezett üzenetfolyam csoportban!" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Ez az alapértelmezett üzenetfolyam csoport már a(z) '%s' nevet viseli!" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "A(z) '%s' alapértelmezett üzenetfolyam csoport már létezik!" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3250,7 +3132,7 @@ msgid "Missing topic" msgstr "" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "" @@ -3279,7 +3161,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3499,26 +3381,22 @@ msgstr "" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3902,7 +3780,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3930,43 +3808,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -4490,7 +4368,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "" diff --git a/static/locale/hu/translations.json b/static/locale/hu/translations.json index 870be80d33..c8deb6c7d5 100644 --- a/static/locale/hu/translations.json +++ b/static/locale/hu/translations.json @@ -456,6 +456,7 @@ "Search results": "", "Search subscribers": "", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "Az üzenet további részének megjelenítése", "Select date and time": "", "Select default language": "", diff --git a/static/locale/id_ID/LC_MESSAGES/django.po b/static/locale/id_ID/LC_MESSAGES/django.po index c8f6060090..6bb7de0e22 100644 --- a/static/locale/id_ID/LC_MESSAGES/django.po +++ b/static/locale/id_ID/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/zulip/zulip/language/id_ID/)\n" "MIME-Version: 1.0\n" @@ -292,8 +292,8 @@ msgstr "Mendaftar" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -448,7 +448,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Apakah anda yakin ingin menghapus pesan ini?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Batal" @@ -597,11 +597,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Belum ada seorangpun yang membicarakan hal tersebut!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Pesan" @@ -633,48 +633,48 @@ msgstr "Coba sekarang." msgid "Invite users to Zulip" msgstr "Undang pengguna ke Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Email (satu untuk setiap baris atau dipisahkan koma)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Satu atau lebih alamat email..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Undang pengguna sebagai" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Anggota" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Pengurus organisasi" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Siaran yang mereka harus ikuti" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Mengundang..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Undang" @@ -740,7 +740,7 @@ msgid "Navigation" msgstr "Navigasi" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Cari stream" @@ -942,7 +942,7 @@ msgstr "Berlanggan, tambahkan, atau atur siaran" msgid "Filter streams" msgstr "Saring stream" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Semua stream" @@ -1142,14 +1142,14 @@ msgstr "Saring pengguna" msgid "USERS" msgstr "PENGGUNA" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Undang lebih banyak pengguna" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "PESAN PRIBADI GRUP" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Undang lebih banyak pengguna" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operator" @@ -1427,37 +1427,37 @@ msgstr "" msgid "Normal users" msgstr "Pengguna biasa" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1472,48 +1472,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1526,83 +1528,81 @@ msgid "Welcome to Zulip!" msgstr "Selamat datang di Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1611,14 +1611,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1670,7 +1670,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1686,7 +1686,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1706,14 +1706,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1725,17 +1725,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1765,10 +1764,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1777,178 +1777,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Reset kata sandi" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1996,35 +1975,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2244,24 +2191,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2295,14 +2224,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2312,24 +2233,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2346,27 +2249,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2990,7 +2872,7 @@ msgid "" "to register for accounts in this organization." msgstr "Alamat email Anda, {email}, tidak termasuk dalam salah satu domain yang diperbolehkan untuk mendaftar akun pada organisasi ini." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Mohon gunakan email asli Anda." @@ -3044,7 +2926,7 @@ msgstr "Deskripsi" msgid "hello" msgstr "halo" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3129,120 +3011,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Nama grup siaran default invalid: %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' adalah siaran default dan tidak dapat ditambahkan ke '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "Grup siaran default %(group_name)s sudah ada" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Grup siaran default ini telah sudah dinamai '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Grup siaran default '%s' sudah ada" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Pesan invalid" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Alamat tidak valid." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Diluar domain Anda." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Telah mempunyai akun." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "Anda tidak mempunyai sisa undangan yang cukup. Silakan kontak %s untuk meningkatkan batas yang Anda miliki. Undangan tidak terkirim." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Beberapa email tidak tervalidasi, jadi kami tidak mengirimkan undangan apapun." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Kami tidak dapat mengundang siapapun." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Beberapa dari alamat itu telah menggunakan Zulip, jadi kami tidak mengirimkan mereka undangan. Namun kami mengirimkan undangan kepada orang-orang yang lain!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Grup pengguna '%s' sudah ada." @@ -3252,7 +3134,7 @@ msgid "Missing topic" msgstr "Topik tidak ada" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Topik tidak boleh kosong" @@ -3281,7 +3163,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Sebuah eror telah terjadi saat menghapus lampiran tersebut. Silakan coba lagi nanti." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3501,26 +3383,22 @@ msgstr "Operator %s tidak didukung." msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token tidak ada" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "Diterima 500 dari push notification bouncer" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "Eror push notifications bouncer: %s" @@ -3904,7 +3782,7 @@ msgstr "Anda tidak berotoritas untuk mengakses antrian ini" msgid "No REMOTE_USER set." msgstr "Tidak ada REMOTE_USER di set." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "OTP tidak valid" @@ -3932,43 +3810,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "Subdomain salah" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Akun Anda telah dinonaktifkan" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Pengguna ini belum terdaftar." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Kata sandi auth dinonaktifkan pada tim Anda." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Pengguna ini tidak teregistrasi; Lakukan hal demikian pada sebuah browser." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Nama pengguna atau kata sandi anda salah." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Subdomain tidak valid" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Subdomain dibutuhkan" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID belum diatur" @@ -4492,7 +4370,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Konten tidak boleh kosong" diff --git a/static/locale/id_ID/translations.json b/static/locale/id_ID/translations.json index 4c6cb56264..1d8d0c818e 100644 --- a/static/locale/id_ID/translations.json +++ b/static/locale/id_ID/translations.json @@ -456,6 +456,7 @@ "Search results": "Hasil pencarian", "Search subscribers": "Cari pelanggan", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "", "Select date and time": "", "Select default language": "", diff --git a/static/locale/it/LC_MESSAGES/django.po b/static/locale/it/LC_MESSAGES/django.po index 4989f9db91..91b0878fc6 100644 --- a/static/locale/it/LC_MESSAGES/django.po +++ b/static/locale/it/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Italian (http://www.transifex.com/zulip/zulip/language/it/)\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ msgstr "Registrati" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -419,7 +419,7 @@ msgstr "Allega file" #: templates/zerver/app/compose.html:101 msgid "Add video call" -msgstr "" +msgstr "Aggiungi videochiamata" #: templates/zerver/app/compose.html:102 msgid "Write" @@ -446,7 +446,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Sei sicuro di voler eliminare questo messaggio?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Cancella" @@ -595,11 +595,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -631,48 +631,48 @@ msgstr "Prova adesso." msgid "Invite users to Zulip" msgstr "Invita utenti in Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Emails (una per riga o separate da virgola)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Uno o più indirizzi email..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Membri" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Amministratori dell'organizzazione" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Canali che dovrebbero seguire" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Invita" @@ -738,7 +738,7 @@ msgid "Navigation" msgstr "" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Canali di ricerca" @@ -940,7 +940,7 @@ msgstr "Sottoscrivi, aggiungi o configura canali" msgid "Filter streams" msgstr "Filtra i canali" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Tutti i canali" @@ -1140,14 +1140,14 @@ msgstr "Filtra gli utenti" msgid "USERS" msgstr "UTENTI" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Invita altri utenti" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Invita altri utenti" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operatore" @@ -1425,37 +1425,37 @@ msgstr "" msgid "Normal users" msgstr "Utenti normali" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1470,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Puoi entrare nella tua organizzazione Zulip, %(realm_name)s,\nal link seguente:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1526,81 @@ msgid "Welcome to Zulip!" msgstr "Benvenuto in Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1609,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1668,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1684,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1704,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1723,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1762,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1775,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "Annulla l'iscrizione delle notifiche del login" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1973,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2189,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2222,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2231,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2247,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2870,7 @@ msgid "" "to register for accounts in this organization." msgstr "Il tuo indirizzo email, {email}, non appartiene a uno dei domini che sono autorizzati a registrarsi in questa organizzazione." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3042,7 +2924,7 @@ msgstr "Descrizione" msgid "hello" msgstr "ciao" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3009,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "I dati dei sottoscrittori non sono disponibili per questo canale" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "Non posso ottenere l'elenco dei sottoscrittori del canale privato" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Gruppo del canale di default non valido %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' è un canale di default e non può essere aggiunto a '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "Il gruppo di default '%(group_name)s' esiste già" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "Il canale '%(stream_name)s' è già presente nel gruppo del canale di default '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "Il canale '%(stream_name)s' non è presente nel gruppo dei canali di default '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Questo gruppo di canali di default si chiama già '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Il gruppo di canali di default '%s' esiste già" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Messaggio(i) non valido" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Indirizzo non valido." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Fuori del tuo dominio." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Hai già un account." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Il tuo account è troppo recente per poter spedire inviti per questa organizzazione. Chiedi ad un amministratore, o a un utente più anziano." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Alcune email non sono valide, quindi non abbiamo inviato nessun invito." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Non siamo stati in grado di invitare nessuno." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Alcuni di questi indirizzi stanno già utilizzando Zulip, quindi non possiamo inviare l'invito. Abbiamo inviato inviti a tutti gli altri! " -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3250,7 +3132,7 @@ msgid "Missing topic" msgstr "Argomento mancante" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "L'argomento non può essere vuoto" @@ -3279,7 +3161,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "Il messaggio deve avere destinatari!" @@ -3499,26 +3381,22 @@ msgstr "Operatore %s non supportato." msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token inesistente" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3902,7 +3780,7 @@ msgstr "Non sei autorizzato ad accedere a questa coda" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "OTP non valido" @@ -3930,43 +3808,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Il tuo account è stato disattivato." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Questo utente non è registrato." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "L'autenticazione con password è stata disabilitata al tuo team." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Questo utente non è registrato; fallo da un browser." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "La tua username o password sono errati." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Sotto dominio non valido" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Sotto dominio richiesto" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID non è configurato" @@ -4490,7 +4368,7 @@ msgstr "Richiesta webhook sconosciuta" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Il contenuto non può essere vuoto" diff --git a/static/locale/it/translations.json b/static/locale/it/translations.json index 6adc35bb17..4f19ba55ec 100644 --- a/static/locale/it/translations.json +++ b/static/locale/it/translations.json @@ -47,7 +47,7 @@ "Add question": "Aggiungi domanda", "Add stream": "Aggiungi canale", "Add task": "Aggiungi un compito", - "Add video call": "", + "Add video call": "Aggiungi videochiamata", "Added successfully!": "Aggiunto con successo!", "Administrator": "Amministratore", "Administrators can always delete any message.": "Gli amministratori possono sempre cancellare qualunque messaggio.", @@ -248,7 +248,7 @@ "Full name": "Nome", "Generate invite link": "", "Generate new API key": "Genera nuova chiave API", - "Generating link...": "", + "Generating link...": "Generazione del link...", "Generic": "Generico", "Get API key": "Ottieni la chiave API", "Go back": "Indietro", @@ -456,6 +456,7 @@ "Search results": "Risultati della ricerca", "Search subscribers": "Sottoscrittori della ricerca", "Search uploads...": "Cerca caricamenti...", + "Searched for:": "", "See the rest of this message": "Visualizza il resto del messaggio", "Select date and time": "Seleziona data e ora", "Select default language": "Seleziona la lingua di default", diff --git a/static/locale/ja/LC_MESSAGES/django.po b/static/locale/ja/LC_MESSAGES/django.po index 1d29f49b0d..0df4e7d438 100644 --- a/static/locale/ja/LC_MESSAGES/django.po +++ b/static/locale/ja/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Japanese (http://www.transifex.com/zulip/zulip/language/ja/)\n" "MIME-Version: 1.0\n" @@ -292,8 +292,8 @@ msgstr "登録" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -448,7 +448,7 @@ msgid "Are you sure you want to delete this message?" msgstr "本当にこのメッセージを削除しますか？" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "キャンセル" @@ -597,11 +597,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "まだだれもこの話題を話していません！" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "メッセージ" @@ -633,48 +633,48 @@ msgstr "いますぐ" msgid "Invite users to Zulip" msgstr "Zulip へユーザーを招待" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "メールアドレス（1行に1つかカンマで区切る）" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "1つ以上のメールアドレス…" -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "メンバー" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "招待ユーザーが購読するストリーム" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "招待中..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "招待" @@ -740,7 +740,7 @@ msgid "Navigation" msgstr "ナビゲーション" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "ストリームを検索" @@ -942,7 +942,7 @@ msgstr "ストリームの購読、追加、設定" msgid "Filter streams" msgstr "ストリームをフィルター" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "すべてのストリーム" @@ -1142,14 +1142,14 @@ msgstr "ユーザーを絞り込み" msgid "USERS" msgstr "ユーザー" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "ユーザーを招待" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "グループPM" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "ユーザーを招待" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "オペレーター" @@ -1427,37 +1427,37 @@ msgstr "" msgid "Normal users" msgstr "一般ユーザー" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1472,48 +1472,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1526,83 +1528,81 @@ msgid "Welcome to Zulip!" msgstr "Zulipへようこそ！" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1611,14 +1611,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1670,7 +1670,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1686,7 +1686,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1706,14 +1706,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1725,17 +1725,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1765,10 +1764,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1777,178 +1777,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "パスワードをリセット" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1996,35 +1975,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2244,24 +2191,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2295,14 +2224,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2312,24 +2233,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2346,27 +2249,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2990,7 +2872,7 @@ msgid "" "to register for accounts in this organization." msgstr "あなたのメールアドレス {email} はこの組織のアカウントに登録できるドメインではありません。" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "本物のメールアドレスを使ってください。" @@ -3044,7 +2926,7 @@ msgstr "説明" msgid "hello" msgstr "こんにちはー" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3129,120 +3011,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "不正なメッセージ" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "不正なメールアドレス" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "ドメイン外です。" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "アカウントはすでにあります" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3252,7 +3134,7 @@ msgid "Missing topic" msgstr "トピックがありません" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "トピックを入力してください" @@ -3281,7 +3163,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3501,26 +3383,22 @@ msgstr "オペレーター %s はサポートされていません。" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "トークンがありません" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3904,7 +3782,7 @@ msgstr "このキューへのアクセスが許可されていません" msgid "No REMOTE_USER set." msgstr "REMOTE_USER が設定されていません。" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "不正なOTP" @@ -3932,43 +3810,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "誤ったサブドメイン" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "開発環境が有効ではありません。" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "アカウントは無効化されています。" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "このユーザーは登録されていません。" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "チームのパスワード認証は無効です。" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "このユーザーは登録されていません。ブラウザから操作してください。" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "ユーザー名かパスワードが間違っています。" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "不正なサブドメイン" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "サブドメインが必要です" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_IDは設定されていません" @@ -4492,7 +4370,7 @@ msgstr "不明なwebhookリクエスト" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "コンテンツを入力してください" diff --git a/static/locale/ja/translations.json b/static/locale/ja/translations.json index 293d20ca07..6c460b3896 100644 --- a/static/locale/ja/translations.json +++ b/static/locale/ja/translations.json @@ -456,6 +456,7 @@ "Search results": "検索結果", "Search subscribers": "購読者を検索", "Search uploads...": "アップロードしたファイルを検索…", + "Searched for:": "", "See the rest of this message": "このメッセージの残りを表示", "Select date and time": "日時を指定", "Select default language": "デフォルトの言語を選択", diff --git a/static/locale/ko/LC_MESSAGES/django.po b/static/locale/ko/LC_MESSAGES/django.po index 1b3408555d..fa67359a3c 100644 --- a/static/locale/ko/LC_MESSAGES/django.po +++ b/static/locale/ko/LC_MESSAGES/django.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Korean (http://www.transifex.com/zulip/zulip/language/ko/)\n" "MIME-Version: 1.0\n" @@ -299,8 +299,8 @@ msgstr "가입하기" msgid "OR" msgstr "또는" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "%(identity_provider)s로 가입" @@ -455,7 +455,7 @@ msgid "Are you sure you want to delete this message?" msgstr "이 메시지를 삭제하시겠습니까?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "취소" @@ -604,11 +604,11 @@ msgid "" " " msgstr "\n여기서 언급에 대해 더 알아보기." -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "아직 아무도 그것에 대하여 말하지 않았습니다." -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "메시지" @@ -640,48 +640,48 @@ msgstr "지금 시도하기." msgid "Invite users to Zulip" msgstr "Zulip으로 사용자 초대하기." -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "이메일(한 줄에 하나씩 혹은 쉼표로 분리)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "하나 혹은 더 많은 이메일 주소..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "가입한 사용자(들)" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "회원" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "조직 관리자" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "초대된 사람이 가입될 스트림" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "초대 중..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "초대" @@ -747,7 +747,7 @@ msgid "Navigation" msgstr "네비게이션" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "스트림 검색" @@ -949,7 +949,7 @@ msgstr "구독, 추가 혹은 스트림 구성" msgid "Filter streams" msgstr "스트림 검색" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "모든 스트림" @@ -1149,14 +1149,14 @@ msgstr "사용자 필터링" msgid "USERS" msgstr "사용자" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "더 많은 사용자 초대하기" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "그룹 PM" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "더 많은 사용자 초대하기" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "연산자" @@ -1434,37 +1434,37 @@ msgstr "손님 사용자" msgid "Normal users" msgstr "일반 사용자" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "이메일 변경을 확인하세요" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1479,48 +1479,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "등록 완료" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "귀하는 귀하의 Zulip 조직에 로그인할 수 있습니다, %(realm_name)s,\n다음의 링크에서:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1533,83 +1535,81 @@ msgid "Welcome to Zulip!" msgstr "Zulip에 오신 것을 환영합니다!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1618,14 +1618,14 @@ msgstr "" msgid "Team Zulip" msgstr "Zulip 팀" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1677,7 +1677,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1693,7 +1693,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1713,14 +1713,14 @@ msgstr "안녕하세요," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1732,17 +1732,16 @@ msgstr "" msgid "Hi again," msgstr "다시 한 번 안녕하십니까," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1772,10 +1771,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1784,178 +1784,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "비밀번호 초기화" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -2003,35 +1982,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2251,24 +2198,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2302,14 +2231,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2319,24 +2240,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2353,27 +2256,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2997,7 +2879,7 @@ msgid "" "to register for accounts in this organization." msgstr "귀하의 이메일 주소인 {email}은 이 조직의 계정에 등록 할 수있는 도메인에 속해 있지 않습니다." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "귀하의 실제 이메일 주소를 사용하십시오." @@ -3051,7 +2933,7 @@ msgstr "설명" msgid "hello" msgstr "안녕하세요" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3136,120 +3018,120 @@ msgstr "위젯: API 프로그래머가 유효하지 않은 JSON 콘텐츠를 보 msgid "Widgets: %s" msgstr "위젯: %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "구독자 정보는 이 스트림에서 사용되지 않습니다" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "비공개 스트림의 구독자를 검색할 수 없습니다" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "기본 스트림 그룹 %s이 유효하지 않습니다." -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s'은 기본 스트림이기 때문에 '%(group_name)s'에 추가될 수 없습니다" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "기본 스트림 그룹 '%(group_name)s' 가 이미 존재합니다" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "이 기본 스트림 그룹의 이름은 이미 '%s'입니다." -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "기본 스트림 그룹 '%s'이 이미 있습니다." -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "유효하지 않은 플래그: '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "유효하지 않은 메시지" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "유효하지 않은 주소." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "도메인 외부." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "+가 포함된 이메일 주소는 허용되지 않습니다." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "이미 계정이 있습니다." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "귀하의 남아있는 초대장이 충분하지 않습니다. %s에 연락하여 제한을 올리십시오. 초대가 보내지지 않았습니다." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "당신의 계정이 이 조직에 초대를 보내기에는 너무 최근에 만들어졌습니다. 조직 관리자에게 문의하거나, 더 경험있는 사용자에게 물어보세요." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "일부 이메일은 확인되지 않았으므로 초대장을 보내지 않았습니다." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "우리는 누구도 초대할 수 없었습니다." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "그 중 일부 주소는 이미 Zulip을 사용하고 있으므로 초대장을 보내지 않았습니다. 우리는 다른 모든 사람들에게 초대장을 보냈습니다!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "필드 ID {id} 를 찾을 수 없습니다." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "사용자 그룹 '%s'이 이미 있습니다." @@ -3259,7 +3141,7 @@ msgid "Missing topic" msgstr "누락된 주제" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "주제는 비워둘 수 없습니다." @@ -3288,7 +3170,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "첨부 파일을 삭제하는 중 오류가 발생했습니다. 나중에 다시 시도 해주십시오." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3508,26 +3390,22 @@ msgstr "연산자 %s가 지원되지 않습니다." msgid "Missing content" msgstr "누락된 내용" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "토큰이 존재하지 않습니다." -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "푸시 알림 바운서로부터 500 통 받음" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "푸시 알림 바운서 오류 : %s" @@ -3911,7 +3789,7 @@ msgstr "이 대기열에 액세스 할 수 있는 권한이 없습니다." msgid "No REMOTE_USER set." msgstr "REMOTE_USER가 설정되지 않았습니다." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "OTP가 유효하지 않습니다." @@ -3939,43 +3817,43 @@ msgstr "JSON 웹 토큰 클레임에 지정된 조직이 없습니다." msgid "Wrong subdomain" msgstr "잘못된 하위 도메인" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "개발 환경을 사용할 수 없습니다." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "이 조직은 비활성화되었습니다." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "계정이 비활성화되었습니다." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "이 사용자는 등록되지 않았습니다." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "팀에서 비밀번호 인증을 사용할 수 없습니다." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "이 사용자는 등록되지 않았습니다. 브라우저에서 그렇게하십시오." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "사용자명 또는 비밀번호가 잘못되었습니다." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "유효하지 않은 하위 도메인" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "하위 도메인 필요" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID 가 구성되지 않았습니다." @@ -4499,7 +4377,7 @@ msgstr "알 수 없는 웹후크 요청" msgid "Missing required data" msgstr "누락된 필수 데이터" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "내용은 비워 둘 수 없습니다." diff --git a/static/locale/ko/translations.json b/static/locale/ko/translations.json index 10352e91ef..9dc3c235cd 100644 --- a/static/locale/ko/translations.json +++ b/static/locale/ko/translations.json @@ -456,6 +456,7 @@ "Search results": "검색 결과", "Search subscribers": "구독자 검색", "Search uploads...": "업로드 검색...", + "Searched for:": "", "See the rest of this message": "이 메시지의 나머지 부분보기", "Select date and time": "날짜와 시간을 선택하세요", "Select default language": "기본 언어 선택", diff --git a/static/locale/ml/LC_MESSAGES/django.po b/static/locale/ml/LC_MESSAGES/django.po index ff24a17426..ca478cc9e9 100644 --- a/static/locale/ml/LC_MESSAGES/django.po +++ b/static/locale/ml/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Malayalam (http://www.transifex.com/zulip/zulip/language/ml/)\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ msgstr "സൈനപ്പ്" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -446,7 +446,7 @@ msgid "Are you sure you want to delete this message?" msgstr "" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "റദ്ദാക്കുക" @@ -595,11 +595,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -631,48 +631,48 @@ msgstr "" msgid "Invite users to Zulip" msgstr "" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "ഒന്നോ അതിൽ കൂടുതലോ ഈമെയിൽ വിലാസങ്ങൾ" -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "ക്ഷണിക്കൂ" @@ -738,7 +738,7 @@ msgid "Navigation" msgstr "" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "" @@ -940,7 +940,7 @@ msgstr "" msgid "Filter streams" msgstr "" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "എല്ലാ ശാഖകൾ" @@ -1140,12 +1140,12 @@ msgstr "" msgid "USERS" msgstr "" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" +#: templates/zerver/app/right_sidebar.html:28 +msgid "GROUP PMs" msgstr "" -#: templates/zerver/app/right_sidebar.html:31 -msgid "GROUP PMs" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" msgstr "" #: templates/zerver/app/search_operators.html:7 @@ -1425,37 +1425,37 @@ msgstr "" msgid "Normal users" msgstr "സാധാരണ ഉപയോക്താക്കൾ" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1470,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1526,81 @@ msgid "Welcome to Zulip!" msgstr "" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1609,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1668,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1684,7 @@ msgid "Zulip" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1704,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1723,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1762,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1775,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1973,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2189,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2222,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2231,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2247,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2870,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3042,7 +2924,7 @@ msgstr "" msgid "hello" msgstr "" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3009,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3250,7 +3132,7 @@ msgid "Missing topic" msgstr "" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "" @@ -3279,7 +3161,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3499,26 +3381,22 @@ msgstr "" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3902,7 +3780,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3930,43 +3808,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -4490,7 +4368,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "" diff --git a/static/locale/ml/translations.json b/static/locale/ml/translations.json index 24da3f61f0..3f9e854abc 100644 --- a/static/locale/ml/translations.json +++ b/static/locale/ml/translations.json @@ -456,6 +456,7 @@ "Search results": "", "Search subscribers": "", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "ഈ സന്ദേശത്തിന്റെ ബാക്കി കാണുക", "Select date and time": "", "Select default language": "", diff --git a/static/locale/mobile_info.json b/static/locale/mobile_info.json index 05f6de0d77..ed474cb41e 100644 --- a/static/locale/mobile_info.json +++ b/static/locale/mobile_info.json @@ -8,7 +8,7 @@ "total": 160 }, "cs": { - "not_translated": 28, + "not_translated": 0, "total": 160 }, "de": { diff --git a/static/locale/nl/LC_MESSAGES/django.po b/static/locale/nl/LC_MESSAGES/django.po index 133668c2f6..270b5391c2 100644 --- a/static/locale/nl/LC_MESSAGES/django.po +++ b/static/locale/nl/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Dutch (http://www.transifex.com/zulip/zulip/language/nl/)\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ msgstr "Aanmelden" msgid "OR" msgstr "OF" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Aanmelden met %(identity_provider)s" @@ -446,7 +446,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Wilt u dit bericht echt verwijderen?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Annuleren" @@ -595,11 +595,11 @@ msgid "" " " msgstr "\n Lees hier meer over mentions .\n " -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Hier is nog niet over gesproken!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Berichten" @@ -631,48 +631,48 @@ msgstr "Nu proberen." msgid "Invite users to Zulip" msgstr "Nodig gebruikers uit voor Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "E-mailadressen (een per regel, of komma-gescheiden)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Eén of meer e-mailadressen..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Gebruik worden lid als" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Leden" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Beheerders van de organisatie" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Kanalen waar ze lid van kunnen worden" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Aan het uitnodigen..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Uitnodigen" @@ -738,7 +738,7 @@ msgid "Navigation" msgstr "Navigatie" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Kanalen zoeken" @@ -940,7 +940,7 @@ msgstr "Abonneren, toevoegen, of configureren kanalen" msgid "Filter streams" msgstr "Filter kanalen" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Alle kanalen" @@ -1140,14 +1140,14 @@ msgstr "Gebruikers filteren" msgid "USERS" msgstr "GEBRUIKERS" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Nodig meer gebruikers uit" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "GROEP PMs" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Nodig meer gebruikers uit" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operator" @@ -1425,37 +1425,37 @@ msgstr "Guest gebruikers" msgid "Normal users" msgstr "Gewone gebruikers" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Bevestig aanpassing e-mailadres" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1470,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Aanmelding afronden" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Je kunt bij je Zulip-organisatie, %(realm_name)s,\ninloggen via deze link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "Het e-mailadres dat bij je account hoor is %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Als je niet kunt inloggen, neem dan met Zulip support contact op door op dit bericht te antwoorden." +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1526,81 @@ msgid "Welcome to Zulip!" msgstr "Welkom bij Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Groeten," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1609,14 @@ msgstr "Groeten," msgid "Team Zulip" msgstr "Het Zulip-team" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1668,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1684,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1704,14 @@ msgstr "Hoi," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1723,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1762,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1775,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Wachtwoord herstellen" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1973,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2189,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2222,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2231,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2247,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2870,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Gebruik je echte e-mailadres." @@ -3042,7 +2924,7 @@ msgstr "Beschrijving" msgid "hello" msgstr "hallo" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3009,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Ongeldig(e) bericht(en)" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Ongeldig adres." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Buiten je domein." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Heeft al een account." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "We konden niemand uitnodigen." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3250,7 +3132,7 @@ msgid "Missing topic" msgstr "Ontbrekend onderwerp" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Onderwerp kan niet leeg zijn" @@ -3279,7 +3161,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3499,26 +3381,22 @@ msgstr "Bewerking %s niet ondersteund." msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token bestaat niet" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3902,7 +3780,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "Geen REMOTE_USER ingesteld" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3930,43 +3808,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "Verkeerd subdomein" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Ontwikkelomgeving niet ingeschakeld." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Je account is geblokkeerd." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Wachtwoordauthenticatie is voor jouw team uitgeschakeld." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 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:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Je gebruikersnaam of wachtwoord is onjuist." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID is niet geconfigureerd" @@ -4490,7 +4368,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Inhoud kan niet leeg zijn" diff --git a/static/locale/nl/translations.json b/static/locale/nl/translations.json index 7c528f62a0..20144eee15 100644 --- a/static/locale/nl/translations.json +++ b/static/locale/nl/translations.json @@ -456,6 +456,7 @@ "Search results": "", "Search subscribers": "", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "Bekijk de rest van dit bericht", "Select date and time": "", "Select default language": "Selecteer de standaardtaal", diff --git a/static/locale/pl/LC_MESSAGES/django.po b/static/locale/pl/LC_MESSAGES/django.po index a7b3cb9212..5ece7d87e7 100644 --- a/static/locale/pl/LC_MESSAGES/django.po +++ b/static/locale/pl/LC_MESSAGES/django.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Polish (http://www.transifex.com/zulip/zulip/language/pl/)\n" "MIME-Version: 1.0\n" @@ -293,8 +293,8 @@ msgstr "Zarejestruj" msgid "OR" msgstr "LUB" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -449,7 +449,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Masz pewność, że chcesz usunąć tę wiadomość?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Anuluj" @@ -598,11 +598,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Nikt o tym jeszcze nie rozmawiał!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Wiadomości" @@ -634,48 +634,48 @@ msgstr "Spróbuj teraz." msgid "Invite users to Zulip" msgstr "Zaproś użytkowników do Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Emaile (po jednym w wierszu lub oddzielane przecinkami)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Adres(y) email..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Członkowie" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Administratorzy organizacji" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Domyślne kanały" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Zapraszanie..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Zaproś" @@ -741,7 +741,7 @@ msgid "Navigation" msgstr "Nawigacja" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Wyszukaj kanały" @@ -943,7 +943,7 @@ msgstr "Subskrybuj, dodawaj lub konfiguruj kanały" msgid "Filter streams" msgstr "Filtruj kanały" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Wszystkie kanały" @@ -1143,14 +1143,14 @@ msgstr "Filtruj użytkowników" msgid "USERS" msgstr "UŻYTKOWNICY" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Zaproś więcej użytkowników" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "WIADOMOŚCI GRUPOWE" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Zaproś więcej użytkowników" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operator" @@ -1428,37 +1428,37 @@ msgstr "" msgid "Normal users" msgstr "Zwykli użytkownicy" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1473,48 +1473,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1527,83 +1529,81 @@ msgid "Welcome to Zulip!" msgstr "Witaj w Zulipie!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1612,14 +1612,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1671,7 +1671,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1687,7 +1687,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1707,14 +1707,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1726,17 +1726,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1766,10 +1765,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1778,178 +1778,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Zresetuj hasło" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1997,35 +1976,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2245,24 +2192,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2296,14 +2225,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2313,24 +2234,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2347,27 +2250,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2991,7 +2873,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Użyj swojego prawdziwego adresu email." @@ -3045,7 +2927,7 @@ msgstr "Opis" msgid "hello" msgstr "witaj" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3130,120 +3012,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Dane subskrybenta są niedostępnę w tym kanale." -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Domyślna grupa kanałów jest już nazwana `%s`" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Domyślna grupa kanałów '%s' już istnieje." -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Nieprawidłowa wiadomość" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Nieprawidłowy adres." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Poza Twoją domeną." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Posiada już konto." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 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:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Nie mogliśmy nikogo zaprosić." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Niektóre z tych adresów są już zarejestrowane w Zulipie, więc nie wysłaliśmy im zaproszeń. Wszystkie inne dostały zaproszenie!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3253,7 +3135,7 @@ msgid "Missing topic" msgstr "Brak wątku" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Należy określić wątek" @@ -3282,7 +3164,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Wystąpił błąd podczas usuwania załącznika. Spróbuj ponownie później." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3502,26 +3384,22 @@ msgstr "Operator %s nie jest wspierany." msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token nie istnieje" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3905,7 +3783,7 @@ msgstr "Nie masz upawnień do tej kolejki" msgid "No REMOTE_USER set." msgstr "Nie ustawiono REMOTE_USER." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "Nieprawidłowy OTP" @@ -3933,43 +3811,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "Niewłaściwa subdomena" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Środowisko deweloperskie jest wyłączone." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Twoje konto zostało wyłączone." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Ten użytkownik jest niezarejestrowany." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Uwierzytelnianie hasłem jest wyłączone w twoim zespole." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 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:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Twoja nazwa użytkownika lub hasło są nieprawidłowe." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Nieprawidłowa subdomena" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Subdomena jest wymagana" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID nie jest skonfigurowany" @@ -4493,7 +4371,7 @@ msgstr "Nieznany webhook request" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Treść nie może być pusta" diff --git a/static/locale/pl/translations.json b/static/locale/pl/translations.json index 268da0460f..a2e4ac3e22 100644 --- a/static/locale/pl/translations.json +++ b/static/locale/pl/translations.json @@ -456,6 +456,7 @@ "Search results": "", "Search subscribers": "", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "Zobacz dalszy ciąg wiadomości", "Select date and time": "", "Select default language": "Wybierz język domyślny", diff --git a/static/locale/pt/LC_MESSAGES/django.po b/static/locale/pt/LC_MESSAGES/django.po index d04bdc3f38..38e473a40a 100644 --- a/static/locale/pt/LC_MESSAGES/django.po +++ b/static/locale/pt/LC_MESSAGES/django.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" -"Last-Translator: André Lopes Pereira \n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+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" @@ -293,8 +293,8 @@ msgstr "Inscreva-se" msgid "OR" msgstr "OU" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Inscrever-se com %(identity_provider)s" @@ -449,7 +449,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Você tem certeza que quer excluir esta mensagem?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Cancelar" @@ -598,11 +598,11 @@ msgid "" " " msgstr "\n Saiba mais sobre menções \n aqui.\n " -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Ninguém falou sobre isso ainda!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Mensagens" @@ -634,48 +634,48 @@ msgstr "Tente agora." msgid "Invite users to Zulip" msgstr "Convide usuários para Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Emails (um em cada linha ou separada por vírgulas)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Um ou mais endereços de e-mail..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" -msgstr "" +msgstr "ou" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" -msgstr "" +msgstr "Gerar link de convite" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" -msgstr "Usuário(s) ingressa como" +msgstr "Usuários ingressam como" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Membros" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Administradores de organização" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "Convidados" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Fluxos que eles devem ingressar" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Convidando..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Convidar" @@ -741,7 +741,7 @@ msgid "Navigation" msgstr "Navegação" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Pesquisar fluxos" @@ -943,7 +943,7 @@ msgstr "Inscreva-se, adicione ou configure fluxos" msgid "Filter streams" msgstr "Filtrar fluxos" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Todos os fluxos" @@ -1143,14 +1143,14 @@ msgstr "Filtrar usuários" msgid "USERS" msgstr "USUÁRIOS" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Convidar mais usuários" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "GRUPO DE MPs" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Convidar mais usuários" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operador" @@ -1428,38 +1428,38 @@ msgstr "Usuários convidados" msgid "Normal users" msgstr "Usuários padrão" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 +#, python-format +msgid "Hi %(user_name)s," +msgstr "Olá %(user_name)s," + +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" Hi %(user_name)s,\n" -" " -msgstr "\n Olá %(user_name)s,\n " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" +msgstr "Nós recebemos uma solicitação para alterar o endereço de e-mail para a conta do Zulip em %(realm_uri)s de %(old_email)s para %(new_email)s. Para confirmar esta modificação, por favor clique abaixo:" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 -#, python-format -msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " -msgstr "\n Nós recebemos uma requisição para modificar o endereço de e-mail para a conta do Zulip em\n %(realm_uri)s de %(old_email)s para %(new_email)s.\n Para confirmar esta modificação, por favor clique abaixo:\n " - -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Confirmar alteração de e-mail" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " -msgstr "\n Se você não solicitou essa alteração, por favor contacte-nos imediatamente em\n %(support_email)s.\n " +"If you did not request this change, please contact us immediately at %(support_email)s." +msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 #: templates/zerver/emails/confirm_registration.source.html:9 @@ -1473,48 +1473,50 @@ msgid "Click the button below to complete registration." msgstr "Clique no botão abaixo para concluir o registro." #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Completar registro" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " -msgstr "\n Contacte-nos a qualquer momento em\n %(support_email)s\n se você tiver problemas, tiver algum retorno ou apenas quiser conversar!\n " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Você pode entrar na sua organização Zulip, %(realm_name)s,\nno seguinte link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "Você pode entrar em sua organização Zulip, %(realm_name)s, no seguinte link:" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "O endereço de e-mail associado à sua conta é %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Se você tiver problemas para entrar, por favor, entre em contato com o suporte do Zulip respondendo a\neste e-mail." +msgstr "Se você tiver problemas para entrar, por favor contacte o suporte do Zulip respondendo a este e-mail." -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1527,83 +1529,81 @@ msgid "Welcome to Zulip!" msgstr "Bem-vindo ao Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Você criou a nova organização Zulip %(realm_name)s.\n " +msgid "You've created the new Zulip organization %(realm_name)s." +msgstr "Você criou a nova organização Zulip %(realm_name)s." -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Você ingressou à organização Zulip %(realm_name)s.\n " +msgid "You've joined the Zulip organization %(realm_name)s." +msgstr "Você ingressou a organização Zulip %(realm_name)s." -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "Detalhes da sua conta:" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "URL da organização:" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "Nome de usuário:" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "Utilize sua conta LDAP para entrar" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "E-mail:" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " -msgstr "\n (você precisará disso para entrar nos aplicativos móvel e de área de trabalho)\n " +"(you'll need these to sign in to the mobile and desktop " +"apps)" +msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " -msgstr "\n Confira nosso guia para administradores, torne-se um profissional no Zulip com\n alguns atalhos de teclado, ou vai fundo!\n " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" +msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " -msgstr "\n Aprenda mais sobre o Zulip, torne-se um profissional com alguns\n atalhos de teclado, ou vai fundo!\n " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" +msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Felicidades," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1612,15 +1612,15 @@ msgstr "Felicidades," msgid "Team Zulip" msgstr "Equipe Zulip" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " -msgstr "\n PS: Siga-nos no Twitter,\n marque-nos no GitHub, ou\n converse conosco ao vivo no \n servidor de comunidade Zulip!\n " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" +msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 #: templates/zerver/emails/followup_day2.source.html:8 @@ -1671,7 +1671,7 @@ msgid "Take it for a spin now." msgstr "Dê uma volta agora." #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1687,7 +1687,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1707,14 +1707,14 @@ msgstr "Olá," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " -msgstr "\n %(referrer_full_name)s (%(referrer_email)s)\n quer que você se junte a eles no Zulip — a ferramenta de comunicação corporativa projetada para produtividade.\n " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." +msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1726,17 +1726,16 @@ msgstr "Para começar, clique no botão abaixo." msgid "Hi again," msgstr "Olá novamente," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " -msgstr "\n Este é um lembrete amigável que\n %(referrer_name)s (%(referrer_email)s)\n quer que você se junte a eles no Zulip — a ferramenta de comunicação corporativa desenhada para produtividade.\n " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." +msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1766,10 +1765,11 @@ msgid "Best," msgstr "Melhor," #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "Organização: %(organization_url)s Horário: %(login_time)s E-mail: %(user_email)s" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1778,186 +1778,165 @@ msgstr "Organização: %(organization_url)s Horário: %(login_time)s E-mail: %(u msgid "We noticed a recent login for the following Zulip account." msgstr "Observamos uma entrada recente para a seguinte conta Zulip." -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " -msgstr "\n Organização: %(realm_uri)s\n " +"Organization: %(realm_uri)s" +msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " -msgstr "\n E-mail: %(user_email)s\n " +"Email: %(user_email)s" +msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " -msgstr "\n Horário: %(login_time)s\n " +msgid "Time: %(login_time)s" +msgstr "Horário: %(login_time)s" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " -msgstr "\n Dispositivo: %(device_browser)s em %(device_os)s.\n " +msgid "Device: %(device_browser)s on %(device_os)s." +msgstr "Dispositivo: %(device_browser)s em %(device_os)s." -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " -msgstr "\n Endereço IP: %(device_ip)s\n " +msgid "IP address: %(device_ip)s" +msgstr "Endereço IP: %(device_ip)s" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "Se isto foi você, ótimo! Não há mais nada que você precise fazer." -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " -msgstr "\n Se você não reconhece esta entrada, ou imagina que sua conta pode ter sido comprometida, por favor\n redefina sua senha\n ou contacte-nos imediatamente em %(support_email)s.\n " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." +msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "Segurança do Zulip" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "Desinscrever de notificações de entrada" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " -msgstr "\n Alguém (possivelmente você) solicitou uma nova senha para a conta do Zulip %(email)s em %(realm_uri)s.\n " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." +msgstr "Alguém (provavelmente você) requisitou uma nova senha para a conta do Zulip %(email)s em %(realm_uri)s." -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "Clique no botão abaixo para redefinir sua senha." -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Redefinir senha" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " -msgstr "\n Você já tinha uma conta em %(realm_uri)s, mas ela foi desativada.\n Você pode contactar um administrador da organização para\n reativar sua conta.\n " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." +msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " -msgstr "\n Você não tem uma conta naquela organização Zulip.\n " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." +msgstr "Você não tem uma conta nessa organização Zulip." -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "Você tem contas ativas nas seguintes organizações." -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " -msgstr "\n Você pode tentar fazer login ou redefinir sua senha nas organizações acima.\n " +"You can try logging in or resetting your password in the organization(s) " +"above." +msgstr "Você pode tentar entrar ou redefinir sua senha nas organizações acima." -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " -msgstr "\n Se você não reconhece essa atividade, você pode ignorar esse e-mail com segurança.\n " +"If you do not recognize this activity, you can safely ignore this email." +msgstr "Se você não reconhece esta atividade, você pode ignorar com segurança este e-mail." -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "Caros antigos administradores de %(realm_name)s," + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " -msgstr "\n Caros antigos administradores de %(realm_name)s,\n " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." +msgstr "Um de seus administradores requisitou a reativação da organização anteriormente desativada do Zulip hospedada em %(realm_uri)s." -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "\n Um de seus administradores solicitou a reativação da\n organização anteriormente desativada do Zulip hospedada em %(realm_uri)s.\n " - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "Clique no botão abaixo para reativar sua organização." -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "Reativar organização" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "\n Se a solicitação tiver ocorrido um erro, você não poderá fazer nada e esse link\n expirará em 24 horas.\n " - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" -msgstr "" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." +msgstr "Se na requisição tiver ocorrido um erro, você não poderá fazer nada e esse link expirará em 24 horas." #: templates/zerver/emails/confirm_new_email.source.html:13 #, python-format msgid "" "If you did not request this change, please contact us immediately at %(support_email)s." -msgstr "" +msgstr "Se você não requisitou essa modificação, por favor contacte-nos imediatamente em %(support_email)s." #: templates/zerver/emails/confirm_new_email.subject.txt:1 msgid "Verify your new email address" @@ -1968,7 +1947,7 @@ msgstr "Verifique seu novo endereço de e-mail" msgid "" "If you did not request this change, please contact us immediately at " "<%(support_email)s>." -msgstr "" +msgstr "Se você não requisitou esta modificação. por favor contacte-nos imediatamente em <%(support_email)s>." #: templates/zerver/emails/confirm_registration.source.html:15 #: templates/zerver/emails/invitation.source.html:18 @@ -1979,7 +1958,7 @@ msgid "" "Contact us any time at %(support_email)s if you run into " "trouble, have any feedback, or just want to chat!" -msgstr "" +msgstr "Contacte-nos a qualquer momento em %(support_email)s se você tiver problemas, tiver algum retorno ou apenas quiser conversar!" #: templates/zerver/emails/confirm_registration.subject.txt:1 msgid "Activate your Zulip account" @@ -1995,42 +1974,17 @@ msgstr "Clique no link abaixo para completar o registro." msgid "" "Contact us any time at %(support_email)s if you run into trouble,have any " "feedback, or just want to chat!" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" +msgstr "Contacte-nos a qualquer momento em %(support_email)s se você tiver problemas, tiver algum retorno ou apenas quiser conversar!" #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "Sua página de entrada no Zulip" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the mobile and desktop apps)" -msgstr "" +msgstr "(você precisará disso para entrar nos aplicativos móvel e de área de trabalho)" #: templates/zerver/emails/followup_day1.source.html:35 #, python-format @@ -2039,7 +1993,7 @@ msgid "" "become a Zulip pro with a few keyboard shortcuts, or dive right in!" -msgstr "" +msgstr "Confira nosso guia para administradores, torne-se um profissional no Zulip com alguns atalhos de teclado, ou vai fundo!" #: templates/zerver/emails/followup_day1.source.html:37 #, python-format @@ -2047,40 +2001,40 @@ msgid "" "Learn more about Zulip, become a " "pro with a few keyboard " "shortcuts, or dive right in!" -msgstr "" +msgstr "Aprenda mais sobre o Zulip, torne-se um profissional com alguns atalhos de teclado, ou vai fundo!" #: templates/zerver/emails/followup_day1.source.html:47 msgid "" "PS: Follow us on Twitter, star us " "on GitHub, or chat with us " "live on the Zulip community server!" -msgstr "" +msgstr "PS: Confira-nos no Twitter, marque-nos no GitHub, ou converse conosco ao vivo no servidor da comunidade Zulip!" #: templates/zerver/emails/followup_day1.subject.txt:2 #, python-format msgid "%(realm_name)s on Zulip: Your new organization details" -msgstr "" +msgstr "%(realm_name)s no Zulip: Detalhes da sua nova organização" #: templates/zerver/emails/followup_day1.subject.txt:4 #, python-format msgid "%(realm_name)s on Zulip: Your new account details" -msgstr "" +msgstr "%(realm_name)s no Zulip: Detalhes de sua nova conta" #: templates/zerver/emails/followup_day1.txt:4 #, python-format msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" +msgstr "Você criou a nova organização Zulip %(realm_name)s." #: templates/zerver/emails/followup_day1.txt:6 #, python-format msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" +msgstr "Você ingressou na organização Zulip %(realm_name)s." #: templates/zerver/emails/followup_day1.txt:21 msgid "" "(you'll need these to sign in to the mobile and desktop apps " "(https://zulipchat.com/apps))" -msgstr "" +msgstr "(você precisará disso para entrar nos aplicativos móvel e de área de trabalho (https://zulipchat.com/apps))" #: templates/zerver/emails/followup_day1.txt:25 #, python-format @@ -2088,7 +2042,7 @@ msgid "" "Check out our guide (%(getting_started_link)s) for admins, become a Zulip " "pro with a few keyboard shortcuts (%(keyboard_shortcuts_link)s), or dive " "right in to %(realm_uri)s!" -msgstr "" +msgstr "Confira nosso guia (%(getting_started_link)s) para administradores, torne-se um profissional no Zulip com alguns atalhos de teclado (%(keyboard_shortcuts_link)s), ou vai fundo para %(realm_uri)s!" #: templates/zerver/emails/followup_day1.txt:27 #, python-format @@ -2096,14 +2050,14 @@ msgid "" "Learn more (%(getting_started_link)s) about Zulip, become a pro with a few " "keyboard shortcuts (%(keyboard_shortcuts_link)s), or dive right in to " "%(realm_uri)s!" -msgstr "" +msgstr "Aprenda mais (%(getting_started_link)s) sobre o Zulip, torne-se um profissional com alguns atalhos de teclado (%(keyboard_shortcuts_link)s), ou vai fundo para %(realm_uri)s!" #: templates/zerver/emails/followup_day1.txt:34 msgid "" "PS: Check us out on Twitter (@zulip), star us on GitHub " "(https://github.com/zulip/zulip), or chat with us live on the Zulip " "community server (https://chat.zulip.org)!" -msgstr "" +msgstr "PS: Confira-nos no Twitter (@zulip), marque-nos no GitHub (https://github.com/zulip/zulip), ou converse conosco ao vivo no servidor da comunidade Zulip (https://chat.zulip.org )!" #: templates/zerver/emails/followup_day2.source.html:14 msgid "" @@ -2157,7 +2111,7 @@ msgid "" "%(referrer_full_name)s (%(referrer_email)s)wants you to join " "them on Zulip — the team communication tool designed for productivity." -msgstr "" +msgstr "%(referrer_full_name)s (%(referrer_email)s) quer que você se junte a eles no Zulip — a ferramenta de comunicação corporativa projetada para produtividade." #: templates/zerver/emails/invitation.subject.txt:1 #, python-format @@ -2183,7 +2137,7 @@ msgid "" "href=\"mailto:%(referrer_email)s\">%(referrer_email)s) wants you to join" " them on Zulip — the team communication tool designed for " "productivity." -msgstr "" +msgstr "Este é um lembrete amigável que %(referrer_name)s (%(referrer_email)s) quer que você se junte a eles no Zulip — a ferramenta de comunicação corporativa projetada para produtividade." #: templates/zerver/emails/invitation_reminder.subject.txt:1 #, python-format @@ -2196,7 +2150,7 @@ msgid "" "This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) " "wants you to join them on Zulip -- the team communication tool designed for " "productivity." -msgstr "" +msgstr "Este é um lembrete amigável que %(referrer_name)s (%(referrer_email)s) quer que você se junte a eles no Zulip — a ferramenta de comunicação corporativa projetada para produtividade." #: templates/zerver/emails/invitation_reminder.txt:10 #: templates/zerver/emails/realm_reactivation.txt:13 @@ -2204,7 +2158,7 @@ msgstr "" msgid "" "Contact us any time at %(support_email)s if you run into trouble, have any " "feedback, or just want to chat!" -msgstr "" +msgstr "Contacte-nos a qualquer momento em %(support_email)s se você tiver problemas, tiver algum retorno ou apenas quiser conversar!" #: templates/zerver/emails/notify_change_in_email.source.html:10 #, python-format @@ -2226,42 +2180,17 @@ msgid "" "The email associated with your Zulip account was recently changed to " "%(new_email)s. If you did not request this change, please contact us " "immediately at <%(support_email)s>." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" +msgstr "O email associado à sua conta Zulip foi recentemente alterado para %(new_email)s. Se você não solicitou essa alteração, por favor, contacte-nos imediatamente em <%(support_email)s>." #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" -msgstr "" +msgstr "Organização: %(realm_uri)s" #: templates/zerver/emails/notify_new_login.source.html:19 #, python-format msgid "Email: %(user_email)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "Horário: %(login_time)s" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "Dispositivo: %(device_browser)s em %(device_os)s." - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "Endereço IP: %(device_ip)s" +msgstr "E-mail: %(user_email)s" #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format @@ -2270,7 +2199,7 @@ msgid "" "compromised, please reset your password or contact us immediately at %(support_email)s." -msgstr "" +msgstr "Se você não reconhece esta entrada, ou imagina que sua conta pode ter sido comprometida, por favor redefina sua senha ou contacte-nos imediatamente em %(support_email)s." #: templates/zerver/emails/notify_new_login.subject.txt:1 #, python-format @@ -2294,15 +2223,7 @@ msgid "" "compromised, please reset your password at " "%(realm_uri)s/accounts/password/reset/ or contact us immediately at " "%(support_email)s." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" +msgstr "Se você não reconhece esta entrada, ou imagina que sua conta pode ter sido comprometida, por favor redefina sua senha em %(realm_uri)s/accounts/password/reset/ ou contacte-nos imediatamente em %(support_email)s." #: templates/zerver/emails/password_reset.source.html:19 #, python-format @@ -2311,25 +2232,7 @@ msgid "" " You can contact an organization administrator to reactivate your " "account." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" +msgstr "Você já tinha uma conta em %(realm_uri)s, mas ela foi desativada. Você pode contactar um administrador da organização para reativar sua conta." #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format @@ -2345,28 +2248,7 @@ msgstr "Clique no link abaixo para redefinir sua senha." msgid "" "You previously had an account on %(realm_uri)s, but it has been deactivated." " You can contact an organization administrator to reactivate your account." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" +msgstr "Você já tinha uma conta em %(realm_uri)s, mas ela foi desativada. Você pode contactar um administrador da organização para reativar sua conta." #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." @@ -2991,7 +2873,7 @@ msgid "" "to register for accounts in this organization." msgstr "Seu endereço de e-mail {email} não está em um dos domínios com permissão para se inscrever em contas dessa organização." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Por favor, utilize seu endereço de e-mail real." @@ -3045,7 +2927,7 @@ msgstr "Descrição" msgid "hello" msgstr "olá" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3130,120 +3012,120 @@ msgstr "Widgets: o programador da API enviou conteúdo JSON inválido" msgid "Widgets: %s" msgstr "Widgets: %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Dados do inscrito não está disponível para este fluxo" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "Impossível recuperar inscritos para fluxo privado" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Grupo de fluxo padrão inválido %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' é o fluxo padrão e não pode ser adicionado ao '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "Grupo de fluxo padrão '%(group_name)s' já existe" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "Fluxo '%(stream_name)s' já está presente no grupo de fluxo padrão '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "Fluxo '%(stream_name)s' não está presente no grupo de fluxo padrão '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Este grupo de fluxo padrão já é chamado de '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Grupo de fluxo padrão '%s' já existe" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "Sinalizador inválido: '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" -msgstr "Mensagem(ns) inválida(s)" +msgstr "Mensagens inválidas" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Endereço inválido." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Fora de seu domínio." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "Endereços de e-mail contendo + não são permitidos." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Já tem uma conta." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "Você não tem convites restantes suficientes. Por favor, entre em contato com %s para ter seu limite aumentado. Nenhum convite foi enviado." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Sua conta é muito nova para enviar convites para esta organização. Pergunte a um administrador da organização ou a um usuário mais experiente." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Alguns e-mails não foram validados, por isso não enviamos nenhum convite." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Não fomos capazes de convidar ninguém." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Alguns desses endereços já estão usando o Zulip, então não enviamos um convite. Nós enviamos convites para todos os outros!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "Mapeamento de pedidos inválido." -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Campo id {id} não encontrado." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Grupo de usuário '%s' já existe." @@ -3253,7 +3135,7 @@ msgid "Missing topic" msgstr "Tópico ausente" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Tópico não pode ser vazio" @@ -3282,7 +3164,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Ocorreu um erro ao excluir o anexo. Por favor, tente novamente mais tarde." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "Mensagem deve ter destinatários!" @@ -3425,7 +3307,7 @@ msgstr "Toda mensagem tem um tópico. Os tópicos mantêm as conversas fáceis d #: zerver/lib/hotspots.py:26 msgid "Go to Settings to configure your notifications and display settings." -msgstr "" +msgstr "Vá para Definições para configurar suas notificações e configurações de exibição." #: zerver/lib/hotspots.py:30 msgid "Compose" @@ -3502,26 +3384,22 @@ msgstr "Operador %s não suportado." msgid "Missing content" msgstr "Conteúdo ausente" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" -msgstr "" +msgstr "Opção de GCM inválida para bouncer: prioridade %r" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" -msgstr "" +msgstr "Opções de GCM inválidas para bouncer: %s" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token não existe" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "Recebido 500 do retorno de notificações via push" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "Erro do retorno de notificações via push: %s" @@ -3578,7 +3456,7 @@ msgstr "Usuário não pode criar fluxos." #: zerver/lib/streams.py:265 #, python-format msgid "Stream(s) (%s) do not exist" -msgstr "Fluxo(s) (%s) não existe(m)" +msgstr "Fluxos (%s) não existem" #: zerver/lib/streams.py:268 msgid "User cannot create a stream with these settings." @@ -3905,7 +3783,7 @@ msgstr "Você não está autorizado a acessar esta fila" msgid "No REMOTE_USER set." msgstr "Nenhum REMOTE_USER definido." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "OTP inválido" @@ -3933,43 +3811,43 @@ msgstr "Nenhuma organização especificada em declarações de token web JSON" msgid "Wrong subdomain" msgstr "Subdomínio incorreto" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Ambiente de desenvolvimento não habilitado." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Esta organização foi desativada." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Sua conta foi desabilitada." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Este usuário não está registrado." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Autenticação por senha está desabilitada em seu time." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Este usuário não está registrado; faça isso de um navegador." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Seu nome de usuário ou senha estão incorretos." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Subdomínio inválido" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Subdomínio requerido" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID não está configurado" @@ -4493,7 +4371,7 @@ msgstr "Requisição webhook desconhecida" msgid "Missing required data" msgstr "Dados obrigatórios ausentes" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Conteúdo não pode ser vazio" diff --git a/static/locale/pt/translations.json b/static/locale/pt/translations.json index 5843ed1988..2458def1ab 100644 --- a/static/locale/pt/translations.json +++ b/static/locale/pt/translations.json @@ -80,7 +80,7 @@ "Are invitations required for joining the organization?": "Convites são obrigatórios para ingressar na organização?", "Are you sure you want to create stream '__stream_name__' and subscribe __count__ users to it?": "Tem certeza de que deseja criar o fluxo '__stream_name__' e inscrever __count__ usuários nele?", "Are you sure you want to delete __group_name__?": "Tem certeza de que deseja excluir __group_name__?", - "Are you sure you want to delete all messages in __topic_name__?": "", + "Are you sure you want to delete all messages in __topic_name__?": "Você tem certeza de que deseja excluir todas as mensagens em __topic_name__?", "Are you sure you want to do this?": "Você tem certeza de que quer fazer isso?", "Are you sure you want to mention all __count__ people in this stream?": "Tem certeza de que deseja mencionar todas as __count__ pessoas neste fluxo?", "Are you sure you want to resend the invitation to ?": "Tem certeza de que deseja reenviar o convite a ?", @@ -156,7 +156,7 @@ "Deactivated users": "Usuários desativados", "Deactivation encountered an error. Please reload and try again.": "A desativação encontrou um erro. Por favor recarregue e tente novamente.", "Default language": "Idioma padrão", - "Default settings for new users joining this organization.": "", + "Default settings for new users joining this organization.": "Configurações padrão para novos usuários que ingressam nessa organização.", "Default streams": "Fluxos padrão", "Default user settings": "Configurações de usuário padrão", "Delete": "Excluir", @@ -169,7 +169,7 @@ "Delete icon": "Excluir ícone", "Delete logo": "Remover logotipo", "Delete message": "Excluir mensagem", - "Delete messages": "", + "Delete messages": "Excluir mensagens", "Delete stream": "Excluir fluxo", "Delete topic": "Excluir tópico", "Delete user group": "Excluir grupo de usuário", @@ -246,9 +246,9 @@ "Forgotten it?": "Esqueceu isso?", "Formatting": "Formatação", "Full name": "Nome completo", - "Generate invite link": "", + "Generate invite link": "Gerar link de convite", "Generate new API key": "Gerar nova chave API", - "Generating link...": "", + "Generating link...": "Gerando link...", "Generic": "Genérico", "Get API key": "Obter chave API", "Go back": "Voltar", @@ -268,7 +268,7 @@ "Interface": "Interface", "Invalid slash command. Check if you are missing a space after the command.": "Comando com barra inválido. Verifique se está faltando um espaço após o comando.", "Invalid stream id": "ID do fluxo inválido", - "Invitation link: __link__": "", + "Invitation link: __link__": "Link de convite: __link__", "Invitations": "Convites", "Invite": "Convidar", "Invite more users": "Convidar mais usuários", @@ -397,7 +397,7 @@ "Organization settings": "Configurações da organização", "Other notification settings": "Outras configurações de notificação", "Other permissions": "Outras permissões", - "Other settings": "", + "Other settings": "Outras configurações", "Outgoing webhook message format": "Formato da mensagem do webhook de saída", "Owner": "Proprietário", "Password": "Senha", @@ -456,6 +456,7 @@ "Search results": "Resultados da pesquisa", "Search subscribers": "Pesquisar inscritos", "Search uploads...": "Pesquisar envios...", + "Searched for:": "", "See the rest of this message": "Ver o restante desta mensagem", "Select date and time": "Selecione data e hora", "Select default language": "Selecione o idioma padrão", @@ -593,7 +594,7 @@ "Visual desktop notifications": "Visualizar notificações de área de trabalho", "Warning: __stream_name__ is a private stream.": "Aviso: __stream_name__ é um fluxo privado.", "We are about to have a poll. Please wait for the question.": "Você está prestes a ter uma enquete. Por favor, aguarde pela pergunta.", - "We recommend against deleting topics unless needed for security reasons or managing abuse. Deleted messages can be confusing for users who may later visit the topic via notifications.": "", + "We recommend against deleting topics unless needed for security reasons or managing abuse. Deleted messages can be confusing for users who may later visit the topic via notifications.": "Recomendamos que você não exclua tópicos, a menos que seja necessário por motivos de segurança ou gerenciamento de abuso. Mensagens excluídas podem ser confusas para usuários que, posteriormente, podem acessar o tópico via notificações.", "Who can add bots": "Quem pode adicionar bots", "Who can add custom emoji": "Quem pode adicionar emoji personalizado", "Who can create streams": "Quem pode criar fluxos", diff --git a/static/locale/ru/LC_MESSAGES/django.po b/static/locale/ru/LC_MESSAGES/django.po index 43634700ef..0a7d510ff1 100644 --- a/static/locale/ru/LC_MESSAGES/django.po +++ b/static/locale/ru/LC_MESSAGES/django.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" -"Last-Translator: Sergey Korablin \n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+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" @@ -297,8 +297,8 @@ msgstr "Зарегистрироваться" msgid "OR" msgstr "ИЛИ" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Зарегистрируйтесь с помощью %(identity_provider)s" @@ -453,7 +453,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Вы действительно хотите удалить это сообщение?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Отмена" @@ -602,11 +602,11 @@ msgid "" " " msgstr "\n Узнай больше об упоминаниях\n тут.\n " -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Никто пока об этом не говорил!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -638,48 +638,48 @@ msgstr "Обновить сейчас." msgid "Invite users to Zulip" msgstr "Пригласить пользователей в Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Email адреса (по одному на строке или через запятую)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Один или несколько адресов email..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Пользователь(и) присоединились как" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Участники" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Администраторы организации" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Каналы, к которым они должны присоединиться" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Приглашаю..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Пригласить" @@ -745,7 +745,7 @@ msgid "Navigation" msgstr "Навигация" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Поиск каналов" @@ -947,7 +947,7 @@ msgstr "Подписаться, создать или настроить кан msgid "Filter streams" msgstr "Отфильтровать каналы" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Все каналы" @@ -1147,14 +1147,14 @@ msgstr "Фильтровать пользователей" msgid "USERS" msgstr "ПОЛЬЗОВАТЕЛИ" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Пригласить еще пользователей" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "ГРУППОВЫЕ ЛС" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Пригласить еще пользователей" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Оператор" @@ -1432,37 +1432,37 @@ msgstr "Гостевые пользователи" msgid "Normal users" msgstr "Обычные пользователи" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Подтвердить изменение почты" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1477,48 +1477,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Завершить регистрацию" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Вы можете войти в вашу организацию Zulip, %(realm_name)s,\nпо этой ссылке:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "Почтовый адрес связанный с вашей учетной записью %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Если у вас возникли проблемы со входом, пожалуйста, свяжитесь с поддержкой Zulip ответив\nна это письмо." +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1531,83 +1533,81 @@ msgid "Welcome to Zulip!" msgstr "Добро пожаловать в Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "С уважением," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1616,14 +1616,14 @@ msgstr "С уважением," msgid "Team Zulip" msgstr "команда Zulip" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1675,7 +1675,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1691,7 +1691,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1711,14 +1711,14 @@ msgstr "Здравствуйте," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1730,17 +1730,16 @@ msgstr "" msgid "Hi again," msgstr "Снова здравствуйте," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1770,10 +1769,11 @@ msgid "Best," msgstr "Лучше всего," #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1782,178 +1782,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Сбросить пароль" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -2001,35 +1980,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2249,24 +2196,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2300,14 +2229,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2317,24 +2238,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2351,27 +2254,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2995,7 +2877,7 @@ msgid "" "to register for accounts in this organization." msgstr "Ваш адрес электронной почты {email} не находится в одном из доменов, которым разрешено регистрироваться в этой организации." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Пожалуйста, используйте реальный адрес email." @@ -3049,7 +2931,7 @@ msgstr "Описание" msgid "hello" msgstr "привет" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3134,120 +3016,120 @@ msgstr "Виджеты: программист API послал неверное msgid "Widgets: %s" msgstr "Виджетов: %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Данные подписчика недоступны для этого канала" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "Невозможно получить подписчиков закрытого канала" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Неверная группа каналов по умолчанию '%s'" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' это канал по умолчанию, и не может быть добавлен к '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "Группа каналов по умолчанию '%(group_name)s' уже существует" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "Канал '%(stream_name)s' уже включен в группу каналов по умолчанию '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "Канал '%(stream_name)s' не включен в группу каналов по умолчанию '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Эта группа каналов по умолчанию уже имеет название '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Группа каналов по умолчанию '%s' уже существует" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "Неверный флаг: '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Неверное сообщение(я)" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Неверный адрес" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Не принадлежит вашему домену." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "Email-адреса, содержащие знак '+', не разрешены." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Уже имеет учетную запись." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "У вас недостаточно оставшихся приглашений. Пожалуйста, свяжитесь с %s чтобы увеличить ваш лимит. Приглашения не были отправлены." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Ваша учетная запись слишком новая для отправки приглашений для этой организации. Попросите администратора организации или более опытного пользователя." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Некоторые адреса email не прошли проверку, поэтому мы не выслали ни одного приглашения." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Мы не смогли никого пригласить." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Некоторые из этих адресов email уже используют Zulip, поэтому мы не стали отправлять им приглашение. А всем остальным - выслали!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "Неверное размещение заказа." -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Id поля {id} не найдено." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Группа пользователей '%s' уже существует." @@ -3257,7 +3139,7 @@ msgid "Missing topic" msgstr "Не заполнена тема" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Тема не может быть пустой" @@ -3286,7 +3168,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "При удалении вложения произошла ошибка. Пожалуйста, повторите попытку позже." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3506,26 +3388,22 @@ msgstr "Оператор %s не поддерживается." msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Токен не существует" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "Получено 500 от ограничителя push-уведомлений" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "Ошибка ограничителя push-уведомлений: %s" @@ -3909,7 +3787,7 @@ msgstr "Вы не авторизованы для доступа к этой о msgid "No REMOTE_USER set." msgstr "Не установлена переменная REMOTE_USER." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "Неверный OTP" @@ -3937,43 +3815,43 @@ msgstr "Ни одной организации не определено в JSON msgid "Wrong subdomain" msgstr "Неправильный поддомен" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Окружение для разработки отключено." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Эта организация отключена." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Ваш аккаунт был отключен." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Такой пользователь не зарегистрирован." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Авторизация по паролю отключена в вашей команде." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Пользователь незарегистрирован; попробуйте через браузер." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Неправильное имя пользователя или пароль." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Неверный поддомен." -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Необходим поддомен" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "Не указан GOOGLE_CLIENT_ID." @@ -4497,7 +4375,7 @@ msgstr "Неизвестный webhook-запрос" msgid "Missing required data" msgstr "Отсутствуют необходимые данные" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Содержимое не может быть пустым" diff --git a/static/locale/ru/translations.json b/static/locale/ru/translations.json index f12af214ee..0aa7442891 100644 --- a/static/locale/ru/translations.json +++ b/static/locale/ru/translations.json @@ -456,6 +456,7 @@ "Search results": "Результаты поиска", "Search subscribers": "Поиск подписчиков", "Search uploads...": "Поиск загрузок...", + "Searched for:": "", "See the rest of this message": "Показать сообщение полностью", "Select date and time": "Выбрать дату и время", "Select default language": "Выбрать язык по умолчанию", diff --git a/static/locale/sr/LC_MESSAGES/django.po b/static/locale/sr/LC_MESSAGES/django.po index 551be702ce..f191c9e039 100644 --- a/static/locale/sr/LC_MESSAGES/django.po +++ b/static/locale/sr/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Serbian (http://www.transifex.com/zulip/zulip/language/sr/)\n" "MIME-Version: 1.0\n" @@ -289,8 +289,8 @@ msgstr "Упишите се" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -445,7 +445,7 @@ msgid "Are you sure you want to delete this message?" msgstr "" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Откажи" @@ -594,11 +594,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Нико није разговарао о томе за сада!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -630,48 +630,48 @@ msgstr "" msgid "Invite users to Zulip" msgstr "" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Е-адресе (једна у свакој линији или их одвојите запетама)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "" -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Токови којима они могу приступити" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Позови" @@ -737,7 +737,7 @@ msgid "Navigation" msgstr "Навигација" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "" @@ -939,7 +939,7 @@ msgstr "" msgid "Filter streams" msgstr "" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Сви токови" @@ -1139,14 +1139,14 @@ msgstr "" msgid "USERS" msgstr "КОРИСНИЦИ" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "ГРУПНИ ПП-ови" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Оператер" @@ -1424,37 +1424,37 @@ msgstr "" msgid "Normal users" msgstr "Обични корисници" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1469,48 +1469,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1523,83 +1525,81 @@ msgid "Welcome to Zulip!" msgstr "" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1608,14 +1608,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1667,7 +1667,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1683,7 +1683,7 @@ msgid "Zulip" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1703,14 +1703,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1722,17 +1722,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1762,10 +1761,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1774,178 +1774,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1993,35 +1972,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2241,24 +2188,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2292,14 +2221,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2309,24 +2230,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2343,27 +2246,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2987,7 +2869,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3041,7 +2923,7 @@ msgstr "" msgid "hello" msgstr "" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3126,120 +3008,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3249,7 +3131,7 @@ msgid "Missing topic" msgstr "" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "" @@ -3278,7 +3160,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3498,26 +3380,22 @@ msgstr "" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3901,7 +3779,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3929,43 +3807,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -4489,7 +4367,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "" diff --git a/static/locale/sr/translations.json b/static/locale/sr/translations.json index c5612b226d..d1f7eca89c 100644 --- a/static/locale/sr/translations.json +++ b/static/locale/sr/translations.json @@ -1,8 +1,8 @@ { "\"__file_name__\" was too large; the maximum file size is 25MiB.": "", "(This user has been deactivated)": "", - "(away)": "", "(no topic)": "", + "(unavailable)": "", "(you)": "", "1 day": "", "1 hour": "", @@ -84,7 +84,8 @@ "Are you sure you want to do this?": "", "Are you sure you want to mention all __count__ people in this stream?": "", "Are you sure you want to resend the invitation to ?": "", - "Are you sure you want to revoke the invitation to ?": "", + "Are you sure you want to revoke the invitation to __email__?": "", + "Are you sure you want to revoke this invitation link created by __referred_by__?": "", "Attach files": "", "Attachment deleted": "", "Audible desktop notifications": "", @@ -116,7 +117,6 @@ "Check all": "", "Choose avatar": "", "Choose custom color": "", - "Clear": "", "Clear avatar": "", "Clear emoji image": "", "Click anywhere on a message to reply.": "", @@ -191,7 +191,7 @@ "Download file": "", "Download zuliprc": "", "Drafts": "", - "Drafts older than __draft_lifetime__ days are automatically removed": "", + "Drafts older than __draft_lifetime__ days are automatically removed.": "", "EDITED": "", "Edit": "", "Edit bot": "", @@ -271,9 +271,9 @@ "Invitation link: __link__": "", "Invitations": "", "Invite": "", + "Invite link": "", "Invite more users": "", "Invited as": "", - "Invited as administrator": "", "Invited at": "", "Invited by": "", "Invites": "", @@ -289,6 +289,7 @@ "Last active": "", "Last modified": "", "Last seen": "", + "Like Organization logo, but for the night theme.": "", "Linkifiers": "", "Local time": "", "Looking for our Integrations or API documentation?": "", @@ -391,6 +392,7 @@ "Organization avatar": "", "Organization description": "", "Organization logo": "", + "Organization logo for night mode": "", "Organization name": "", "Organization permissions": "", "Organization profile": "", @@ -419,6 +421,7 @@ "Preview": "", "Preview profile": "", "Private messages and @-mentions": "", + "Pro tip: You can use 'd' to open your drafts.": "", "Profile": "", "Profile field settings": "", "Quote and reply": "", @@ -442,7 +445,8 @@ "Restrict to a list of domains": "", "Retry": "", "Revoke": "", - "Revoke invitation to ": "", + "Revoke invitation link": "", + "Revoke invitation to __email__": "", "Revoke now": "", "Role": "", "Save": "", @@ -470,8 +474,8 @@ "Sent! Your message was sent to a topic you have muted.": "", "Sent! Your recent message is outside the current search.": "", "Set a status message": "", - "Set yourself to active": "", - "Set yourself to away": "", + "Set yourself as active": "", + "Set yourself as unavailable": "", "Settings": "\u041f\u043e\u0434\u0435\u0448\u0430\u0432\u0430\u045a\u0430", "Setup": "", "Setup two factor authentication": "", @@ -512,6 +516,7 @@ "The email will be forwarded to this stream": "", "The recipient __recipient__ is not valid": "", "The recipients __recipients__ are not valid": "", + "The stream description cannot contain newline characters.": "", "The stream description has been updated!": "", "The stream has been renamed!": "", "Their password will be cleared from our systems, and any bots they maintain will be disabled.": "", @@ -582,13 +587,13 @@ "Video chat provider": "", "View edit history": "", "View file": "", + "View full profile": "", "View messages sent": "", "View private messages": "", "View private messages to myself": "", "View source": "", "View source / Edit topic": "", "View stream": "", - "View user profile": "", "View your profile": "", "Visual desktop notifications": "", "Warning: __stream_name__ is a private stream.": "", @@ -621,6 +626,7 @@ "You have nothing to send!": "", "You must be an organization administrator to create a stream without subscribing.": "", "You need to be running Zephyr mirroring in order to send messages!": "", + "You searched for:": "", "You subscribed to stream __stream__": "", "You unsubscribed from stream __stream__": "", "You're not subscribed to this stream. You will not be notified if other users reply to your message.": "", @@ -642,6 +648,7 @@ "__starred_status__ this message": "", "__wildcard_mention_token__ (Notify stream)": "", "and": "\u0438", + "clear": "", "cookie": "", "group private messages with __recipient__": "", "in 1 hour": "", diff --git a/static/locale/ta/LC_MESSAGES/django.po b/static/locale/ta/LC_MESSAGES/django.po index 61985eac4b..f9bd6ed11c 100644 --- a/static/locale/ta/LC_MESSAGES/django.po +++ b/static/locale/ta/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-12 00:49+0000\n" +"POT-Creation-Date: 2019-02-27 00:30+0000\n" "PO-Revision-Date: 2018-04-11 21:06+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Tamil (http://www.transifex.com/zulip/zulip/language/ta/)\n" @@ -295,8 +295,8 @@ msgstr "" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -600,17 +600,16 @@ msgstr "" #: templates/zerver/app/home.html:138 msgid "" "\n" -" Learn more about mentions \n" +" Learn more about mentions \n" " here.\n" " " msgstr "" #: templates/zerver/app/home.html:145 -msgid "Nobody has talked about that yet!" +msgid "No search results" msgstr "" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 #, fuzzy #| msgid "Private messages" msgid "Messages" @@ -751,7 +750,7 @@ msgid "Navigation" msgstr "" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "" @@ -953,7 +952,7 @@ msgstr "" msgid "Filter streams" msgstr "" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "அனைத்து தகவலரங்கங்கள்" @@ -990,7 +989,7 @@ msgstr "" msgid "You get" msgstr "" -#: templates/zerver/app/markdown_help.html:107 +#: templates/zerver/app/markdown_help.html:112 msgid "" "To add syntax highlighting to a multi-line code block,\n" " add the language's first \n" "Language-Team: Turkish (http://www.transifex.com/zulip/zulip/language/tr/)\n" "MIME-Version: 1.0\n" @@ -291,8 +291,8 @@ msgstr "Kayıt ol" msgid "OR" msgstr "OR" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -447,7 +447,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Bu iletiyi silmek istediğinizden emin misiniz?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "İptal" @@ -596,11 +596,11 @@ msgid "" " " msgstr "\n Anmalar hakkında daha fazla bilgi için \n buraya tıklayınız.\n " -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Henüz kimse bununla ilgili konuşmadı." -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -632,48 +632,48 @@ msgstr "Şimdi dene." msgid "Invite users to Zulip" msgstr "Kullanıcıları Zulip'e davet et" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "E-posta adresleri (her satırda bir tane veya virgül ile ayrılarak)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Bir veya daha fazla e-posta adresi..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Kullanıcı(lar) katılır" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Üyeler" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Organizasyon yöneticileri" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Katılmaları gereken kanallar" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Davet ediyor..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Davet et" @@ -739,7 +739,7 @@ msgid "Navigation" msgstr "Navigasyon" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Kanalları ara" @@ -941,7 +941,7 @@ msgstr "Kanallara abone ol, ekle veya yapılandır" msgid "Filter streams" msgstr "Kanalları süz" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Tüm kanallar" @@ -1141,14 +1141,14 @@ msgstr "Kullanıcıları süz" msgid "USERS" msgstr "KULLANICILAR" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Daha fazla kullanıcı davet et" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "GRUP Öİ'leri" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Daha fazla kullanıcı davet et" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Operator" @@ -1426,37 +1426,37 @@ msgstr "Misafir kullanıcı" msgid "Normal users" msgstr "Normal kullanıcılar" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "E-posta değişikliğini onayla" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1471,48 +1471,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1525,83 +1527,81 @@ msgid "Welcome to Zulip!" msgstr "" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "Alkış," -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1610,14 +1610,14 @@ msgstr "Alkış," msgid "Team Zulip" msgstr "Zulip Takımı" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1669,7 +1669,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1685,7 +1685,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1705,14 +1705,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1724,17 +1724,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1764,10 +1763,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1776,178 +1776,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Parola sıfırla" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1995,35 +1974,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2243,24 +2190,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2294,14 +2223,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2311,24 +2232,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2345,27 +2248,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2989,7 +2871,7 @@ msgid "" "to register for accounts in this organization." msgstr "E-post adresiniz, {email}, bu organizasyonda hesap oluşturmak için izin verilmiş alan adlarından birine ait değil." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Lütfen gercek e-posta adresinizi kullanın." @@ -3043,7 +2925,7 @@ msgstr "Tanım" msgid "hello" msgstr "merhaba" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3128,120 +3010,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Bu kanal için abone bilgisi mevcut değil" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Geçersiz varsayılan kanal grubu %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' varsayılan bir kanal ve '%(group_name)s' e eklenemez" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "'%(group_name)s' adlı varsayılan kanal grubu zaten mevcut" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "'%(stream_name)s' kanalı halihazırda varsayılan kanal grubu '%(group_name)s' içinde" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "'%(stream_name)s' kanalı varsayılan kanal grubu '%(group_name)s' içinde değil" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Varsayılan kanal grubuna halihazırda '%s' ismi verilmiş" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Varsayılan kanal grubu '%s' halihazırda mevcut" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Geçersiz ileti(ler)" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Geçersiz adres." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "Sizin alanınız dışında." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Zaten bir hesabı var." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "Daha fazla davetiyeniz bulunmuyor. Lütfen davetiye sayısı sınırınızın yükseltilmesi için %s ile temas kurunuz. Herhangi bir davetiye gönderilmedi." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Hesabınız bu organizasyon adına davetiye göndermek için çok yenidir. Bir organizasyon yöneticisi veya daha uzun süreli bir başka kullanıcıdan yardım alınız." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "E-postaların bazıları doğrulanamadığından bu kisilere davetiye gönderilemedi. Geri kalan herkesin davetiyesi gönderildi!" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Kimseyi davet edemedik." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Bu adreslerden bazıları zaten Zülip'i kullanıyor, bu yüzden onlara bir davet göndermedik. Diğer herkese davetiye gönderildi!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Field id {id} bulunamadı." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Kullanıcı grubu '%s' halihazırda mevcut." @@ -3251,7 +3133,7 @@ msgid "Missing topic" msgstr "Konu eksik" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Konu boş olamaz" @@ -3280,7 +3162,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Ek silinirken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3500,26 +3382,22 @@ msgstr "%soperatörü desteklenmiyor." msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Jeton (token) bulunamadı" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "Received 500 from push notification bouncer" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "Push notifications bouncer error: %s" @@ -3903,7 +3781,7 @@ msgstr "Bu sıraya erişmek için yetkiniz yok" msgid "No REMOTE_USER set." msgstr "REMOTE_USER girilmemiş" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "Geçersiz OTP" @@ -3931,43 +3809,43 @@ msgstr "No organization specified in JSON web token claims" msgid "Wrong subdomain" msgstr "Yanlış alt alan adı" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Geliştirme ortamı desteği açılmamış" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Bu organizasyon devre dışıdır." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Hesabınız engellendi." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Bu kullanıcı kayıtlı değil." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Takımınızdaki şifre yetkilendirmesi devre dışı." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Bu kullanıcı kayıtlı değil; bir tarayıcıdan yapın." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Kullanıcı adınız veya parolanız hatalı." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Geçersiz alt alan adı" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Alt alan gerekli" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID ayarlanmamış" @@ -4491,7 +4369,7 @@ msgstr "Bilinmeyen webhook isteği" msgid "Missing required data" msgstr "Geçerli veri eksik" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "İçerik boş olamaz" diff --git a/static/locale/tr/translations.json b/static/locale/tr/translations.json index f1a7466dad..c3ed1ee956 100644 --- a/static/locale/tr/translations.json +++ b/static/locale/tr/translations.json @@ -457,6 +457,7 @@ "Search results": "Sonuçları ara", "Search subscribers": "Aboneleri ara", "Search uploads...": "Yüklemeleri ara...", + "Searched for:": "", "See the rest of this message": "Bu iletinin devamını görüntüle", "Select date and time": "Tarih ve zaman seç", "Select default language": "Varsayılan dil seç", diff --git a/static/locale/uk/LC_MESSAGES/django.po b/static/locale/uk/LC_MESSAGES/django.po index d0492ca2e8..ab7b7a95fa 100644 --- a/static/locale/uk/LC_MESSAGES/django.po +++ b/static/locale/uk/LC_MESSAGES/django.po @@ -4,14 +4,15 @@ # # Translators: # Mykola Ronik , 2018-2019 +# Tim Abbott , 2019 # Олег Кравчук , 2018 msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" -"Last-Translator: Mykola Ronik \n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-26 01:10+0000\n" +"Last-Translator: Tim Abbott \n" "Language-Team: Ukrainian (http://www.transifex.com/zulip/zulip/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,7 +186,7 @@ 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 "Повне оновлення всіх графіків відбувається один раз на день.\nГрафік \"Повідомлення, надіслані за часом\" оновлюється раз на годину." +msgstr "Повне оновлення всіх графіків відбувається один раз на день.
Графік “Повідомлення, надіслані за часом” оновлюється раз на годину." #: templates/analytics/stats.html:114 msgid "Analytics documentation" @@ -290,8 +291,8 @@ msgstr "Зареєструватися" msgid "OR" msgstr "АБО" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "Зареєструватися з допомогою %(identity_provider)s" @@ -446,7 +447,7 @@ msgid "Are you sure you want to delete this message?" msgstr "Ви впевнені, що хочете видалити це повідомлення?" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "Скасувати" @@ -491,7 +492,7 @@ msgid "" " and \n" " compose a new stream message.\n" " " -msgstr "\nАбо візьміть питання в свої руки,\nі\nстворіть нове повідомлення каналу." +msgstr "\nАбо візьміть питання в свої руки,\nі\nстворіть нове повідомлення каналу." #: templates/zerver/app/home.html:42 msgid "Nothing's been sent here yet!" @@ -595,11 +596,11 @@ msgid "" " " msgstr "\nДізнайтеся більше про згадування\nтут." -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "Про це ще ніхто не говорив!" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "Повідомлення" @@ -617,7 +618,7 @@ msgstr "Якщо це повідомлення не зникає, будь ла msgid "" "Unable to connect to\n" " Zulip. Updates may be delayed." -msgstr "Неможливо підключитися до\n Zulip. Оновлення можуть бути затримані." +msgstr "Неможливо підключитися до\n Zulip. Оновлення можуть бути затримані." #: templates/zerver/app/index.html:76 msgid "Retrying soon..." @@ -631,48 +632,48 @@ msgstr "Спробуємо зараз." msgid "Invite users to Zulip" msgstr "Запросити користувачів до Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "Електронні адреси (по одній на кожен рядок, або розділяйте комами)" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "Одна або декілька адрес електронної пошти..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "Користувач(і) приєднується як" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "Члени" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "Адміністратори організації" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "Канали вони повинні приєднати" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "Запрошення..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "Запросити" @@ -738,7 +739,7 @@ msgid "Navigation" msgstr "Навігація" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "Пошук каналів" @@ -940,7 +941,7 @@ msgstr "Підпишіться, додайте або налаштуйте ка msgid "Filter streams" msgstr "Фільтр каналів" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "Всі канали" @@ -1140,14 +1141,14 @@ msgstr "Фільтр користувачів" msgid "USERS" msgstr "КОРИСТУВАЧІ" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "Запросити більше користувачів" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "Запросити більше користувачів" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "Оператор" @@ -1425,37 +1426,37 @@ msgstr "Гостьові користувачі" msgid "Normal users" msgstr "Звичайні користувачі" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "Підтвердити зміну електронної пошти" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1471,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "Завершити реєстрацію" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "Ви можете увійти до своєї організації Zulip, %(realm_name)s,\nза наступним посиланням:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "Електронна адреса, пов'язана з вашим обліковим записом, це %(email)s." -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "Якщо у вас виникли проблеми з входом, будь ласка, зв'яжіться зі службою підтримки Zulip, надіславши відповідь на\nцей електронний лист." +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1527,81 @@ msgid "Welcome to Zulip!" msgstr "Ласкаво просимо до Zulip!" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Ви створили нову організацію в Zulip: %(realm_name)s.\n " +msgid "You've created the new Zulip organization %(realm_name)s." +msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " -msgstr "\n Ви приєдналися до організації в Zulip: %(realm_name)s.\n " +msgid "You've joined the Zulip organization %(realm_name)s." +msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "Дані вашого облікового запису:" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "URL-адреса організації:" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "Ім'я користувача:" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "Використовуйте свій обліковий запис LDAP для входу" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "Електронна пошта:" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1610,14 @@ msgstr "" msgid "Team Zulip" msgstr "Команда Zulip" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1669,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1685,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1705,14 @@ msgstr "Привіт," #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1724,16 @@ msgstr "" msgid "Hi again," msgstr "Привіт ще раз," -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1763,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1776,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "Скинути пароль" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "Шановні колишні адміністратори %(realm_name)s," + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " -msgstr "\n Шановні колишні адміністратори %(realm_name)s,\n " - -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "Повторно активувати організацію" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1974,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "Ваша сторінка для входу в Zulip" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2190,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2223,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2232,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2248,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "Шановні колишні адміністратори %(realm_name)s," - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2871,7 @@ msgid "" "to register for accounts in this organization." msgstr "Ваша електронна адреса, {email}, не знаходиться в одному з доменів, яким дозволено зареєструватися для облікових записів у цій організації." -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "Будь ласка, використовуйте свою справжню електронну адресу." @@ -3042,7 +2925,7 @@ msgstr "Опис" msgid "hello" msgstr "привіт" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3010,120 @@ msgstr "" msgid "Widgets: %s" msgstr "Віджети: %s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "Дані підписника недоступні для цього каналу" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "Не вдається отримати підписників для приватного каналу" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "Недійсна група каналів за умовчанням %s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s' є каналом за умовчанням і не може бути доданий до '%(group_name)s'" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "Група каналу за умовчанням '%(group_name)s' вже існує" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "Канал '%(stream_name)s' вже присутній у групі каналів за замовчуванням '%(group_name)s'" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "Канал '%(stream_name)s' не присутній у групі каналів за замовчуванням '%(group_name)s'" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "Ця група каналів за замовчуванням вже названа '%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "Група каналу за умовчанням '%s' вже існує" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "Недійсний прапор: '%s'" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "Недійсне(і) повідомлення" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "Недійсна адреса." -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "За межами вашого домену." -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "Електронні адреси, що містять +, не дозволені." -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "Вже є обліковий запис." -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "У вас залишилися недостатньо запрошень. Зверніться до %s щоб підняти ліміт. Запрошення не надсилалися." -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "Ваш обліковий запис занадто новий для надсилання запрошень для цієї організації. Попросіть адміністратора організації або досвідченого користувача." -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "Деякі електронні листи не підтверджені, тому ми не надсилали жодних запрошень." -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "Ми не змогли запросити когось." -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "Деякі з цих адрес вже використовують Zulip, тому ми не надіслали їм запрошення. Ми надіслали запрошення всім іншим!" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "Недійсне відображення порядку." -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "Ідентифікатор поля {id} не знайдено." -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "Група користувачів '%s' вже існує." @@ -3250,7 +3133,7 @@ msgid "Missing topic" msgstr "Відсутня тема" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "Тема не може бути порожньою" @@ -3279,7 +3162,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "Під час видалення вкладення сталася помилка. Будь-ласка спробуйте пізніше." -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3499,26 +3382,22 @@ msgstr "Оператор %s не підтримується." msgid "Missing content" msgstr "Відсутній вміст" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Токен не існує" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3902,7 +3781,7 @@ msgstr "Ви не маєте дозволу на доступ до цієї че msgid "No REMOTE_USER set." msgstr "Не встановлено REMOTE_USER." -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "Недійсний OTP" @@ -3930,43 +3809,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "Неправильний піддомен" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "Середовище розробки не активоване." -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "Ця організація була деактивована." -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "Ваш обліковий запис вимкнено." -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "Цей користувач не зареєстрований." -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "Авторизацію через пароль вимкнено у вашій команді." -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "Цей користувач не зареєстрований; робіть це в браузері." -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "Ім'я користувача чи пароль неправильні." -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "Недійсний піддомен" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "Необхідний піддомен" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "GOOGLE_CLIENT_ID не налаштовано" @@ -4490,7 +4369,7 @@ msgstr "" msgid "Missing required data" msgstr "Відсутні необхідні дані" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "Вміст не може бути порожнім" diff --git a/static/locale/uk/translations.json b/static/locale/uk/translations.json index 129afa5b05..443975ea91 100644 --- a/static/locale/uk/translations.json +++ b/static/locale/uk/translations.json @@ -456,6 +456,7 @@ "Search results": "Результати пошуку", "Search subscribers": "Пошук підписників", "Search uploads...": "Пошук завантажень...", + "Searched for:": "", "See the rest of this message": "Дивитись решту цього повідомлення", "Select date and time": "Вибрати дату та час", "Select default language": "Вибрати мову за замовчуванням", diff --git a/static/locale/zh_Hans/LC_MESSAGES/django.po b/static/locale/zh_Hans/LC_MESSAGES/django.po index 51ba4f14df..3fc8ae9ba7 100644 --- a/static/locale/zh_Hans/LC_MESSAGES/django.po +++ b/static/locale/zh_Hans/LC_MESSAGES/django.po @@ -7,16 +7,16 @@ # Greg Price , 2017 # Huiming Tao , 2017-2018 # 张建春 , 2016 -# Joel LIU <2671362312@qq.com>, 2019 +# LIU Lin <2671362312@qq.com>, 2019 # longjiang li , 2018 # 张建春 , 2016 msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" -"Last-Translator: longjiang li \n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+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" @@ -295,8 +295,8 @@ msgstr "注册" msgid "OR" msgstr "或" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "使用%(identity_provider)s登录" @@ -451,7 +451,7 @@ msgid "Are you sure you want to delete this message?" msgstr "你确定要删除这条消息吗？" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "取消" @@ -600,11 +600,11 @@ msgid "" " " msgstr "\n了解关于被提到\n点击这里" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "没有用户讨论过相关内容" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "消息" @@ -636,48 +636,48 @@ msgstr "立即连接" msgid "Invite users to Zulip" msgstr "邀请用户到Zulip" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "邮箱地址（每行一个或者用逗号分隔）" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "一个或多个邮箱地址..." -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "加入我们" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "成员" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "社群管理员" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "指定要订阅的频道" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "邀请中..." -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "邀请" @@ -743,7 +743,7 @@ msgid "Navigation" msgstr "导航" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "搜索频道" @@ -945,7 +945,7 @@ msgstr "订阅，添加或配置频道" msgid "Filter streams" msgstr "过滤频道" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "所有频道" @@ -1145,14 +1145,14 @@ msgstr "过滤用户" msgid "USERS" msgstr "用户" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" -msgstr "邀请更多用户" - -#: templates/zerver/app/right_sidebar.html:31 +#: templates/zerver/app/right_sidebar.html:28 msgid "GROUP PMs" msgstr "私信群组" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" +msgstr "邀请更多用户" + #: templates/zerver/app/search_operators.html:7 msgid "Operator" msgstr "操作符" @@ -1430,37 +1430,37 @@ msgstr "访客用户" msgid "Normal users" msgstr "普通用户" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "确认电子邮件更改" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1475,48 +1475,50 @@ msgid "Click the button below to complete registration." msgstr "请点击此处以完成注册" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "完成注册" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" -msgstr "您可以使用下面的链接加入Zulip社群%(realm_name)s" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "您账户关联的电子邮件地址是%(email)s" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." -msgstr "如果您登录遇到问题，请通过回复这封邮件联系Zulip支持团队" +msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1529,83 +1531,81 @@ msgid "Welcome to Zulip!" msgstr "欢迎访问Zulip！" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " -msgstr "\n您新建了一个Zulip社群%(realm_name)s" +msgid "You've created the new Zulip organization %(realm_name)s." +msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " -msgstr "\n您加入了Zulip社群%(realm_name)s" +msgid "You've joined the Zulip organization %(realm_name)s." +msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "您的账户详情：" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "社群地址：" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "用户名：" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "使用您的LDAP账户登录" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "电子邮件：" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "感谢" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1614,14 +1614,14 @@ msgstr "感谢" msgid "Team Zulip" msgstr "Zulip团队" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1673,7 +1673,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1689,7 +1689,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1709,14 +1709,14 @@ msgstr "您好" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1728,17 +1728,16 @@ msgstr "" msgid "Hi again," msgstr "又见面了" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1768,10 +1767,11 @@ msgid "Best," msgstr "最好" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1780,178 +1780,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "重置密码" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "尊敬的%(realm_name)s前管理员" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " -msgstr "\n尊敬的%(realm_name)s前管理员" - -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "重新激活社群" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "\n如果请求是错误的，您可以不采取任何行动，这个链接将在24小时内过期。" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1999,35 +1978,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "您的Zulip登录页面" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2247,24 +2194,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2298,14 +2227,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2315,24 +2236,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2349,27 +2252,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "尊敬的%(realm_name)s前管理员" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2993,7 +2875,7 @@ msgid "" "to register for accounts in this organization." msgstr "您的电子邮件地址{email}不在允许在该社群中注册帐户的域之一。" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "请使用真实的邮件地址注册" @@ -3047,7 +2929,7 @@ msgstr "描述" msgid "hello" msgstr "你好" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3132,120 +3014,120 @@ msgstr "组件:API程序发送了无效的JSON内容" msgid "Widgets: %s" msgstr "组件：%s" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "订阅数据在这个频道不可用" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "无法检索订阅私有频道" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "无效的默认频道组%s" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "'%(stream_name)s'是一个默认频道，不能加入到'%(group_name)s'中" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "默认频道组'%(group_name)s'已经存在" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "频道'%(stream_name)s'已经在默认频道组'%(group_name)s'中" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "频道'%(stream_name)s'不在默认频道组'%(group_name)s'中" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "默认频道组已经命名为'%s'" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "默认频道组'%s'已经存在" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "无效标志：%s" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "消息不正确" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "地址不正确" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "不属于该社区" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "电子邮件不允许包含+" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "帐户已经存在" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "你没有足够的剩余邀请。请联系%s以提高您的限额。没有发出邀请。" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "你的帐号太新了，不能为这个社群发送邀请。询问社群管理人员或更有经验的用户。" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "一些邮箱没有通过验证，因此我们没有发送邀请" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "没有邀请任何人" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "有部分地址已经在使用Zulip，因此没有向他们发送邀请；其余地址已经发送！" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "无效的命令映射" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "找不到字段ID {id}" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "%s" @@ -3255,7 +3137,7 @@ msgid "Missing topic" msgstr "话题不存在" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "话题不能为空" @@ -3284,7 +3166,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "删除附件时发生错误。请稍后再试。" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3504,26 +3386,22 @@ msgstr "不支持操作符：%s" msgid "Missing content" msgstr "内容丢失" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "Token不存在" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "通知推送服务器返回500错误" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "通知推送错误：%s" @@ -3907,7 +3785,7 @@ msgstr "没有权限访问该队列" msgid "No REMOTE_USER set." msgstr "未设置REMOTE_USER" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "无效的OTP" @@ -3935,43 +3813,43 @@ msgstr "JSON 页面令牌中没有指定社群" msgid "Wrong subdomain" msgstr "错误的子域名" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "未使能开发环境" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "这个社群已被禁用" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "帐户已经停用" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "此用户未注册。" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "社区已停用密码认证" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "当前用户未注册，请从浏览器执行该动作" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "用户名和密码不正确" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "无效的子域名" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "需要子域名" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "未配置GOOGLE_CLIENT_ID" @@ -4495,7 +4373,7 @@ msgstr "未知的Webhook请求" msgid "Missing required data" msgstr "缺少必需的数据" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "内容不能为空" diff --git a/static/locale/zh_Hans/translations.json b/static/locale/zh_Hans/translations.json index 0b3542d087..9130a74cb5 100644 --- a/static/locale/zh_Hans/translations.json +++ b/static/locale/zh_Hans/translations.json @@ -456,6 +456,7 @@ "Search results": "搜索结果", "Search subscribers": "搜索订阅者", "Search uploads...": "搜索已上传的文件", + "Searched for:": "", "See the rest of this message": "查看其余内容", "Select date and time": "选择日期和时间", "Select default language": "选择默认语言", diff --git a/static/locale/zh_Hant/LC_MESSAGES/django.po b/static/locale/zh_Hant/LC_MESSAGES/django.po index 1a9ca2c336..21fd7875e8 100644 --- a/static/locale/zh_Hant/LC_MESSAGES/django.po +++ b/static/locale/zh_Hant/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Zulip\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-11 21:53+0000\n" -"PO-Revision-Date: 2019-02-11 21:55+0000\n" +"POT-Creation-Date: 2019-02-14 00:07+0000\n" +"PO-Revision-Date: 2019-02-14 00:08+0000\n" "Last-Translator: Tim Abbott \n" "Language-Team: Chinese Traditional (http://www.transifex.com/zulip/zulip/language/zh-Hant/)\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ msgstr "註冊" msgid "OR" msgstr "" -#: templates/zerver/accounts_home.html:83 -#: templates/zerver/accounts_home.html:93 +#: templates/zerver/accounts_home.html:84 +#: templates/zerver/accounts_home.html:95 #, python-format msgid "Sign up with %(identity_provider)s" msgstr "" @@ -446,7 +446,7 @@ msgid "Are you sure you want to delete this message?" msgstr "您確定要刪除此條訊息嗎？" #: templates/zerver/app/delete_message.html:13 -#: templates/zerver/app/invite_user.html:52 +#: templates/zerver/app/invite_user.html:50 msgid "Cancel" msgstr "取消" @@ -595,11 +595,11 @@ msgid "" " " msgstr "" -#: templates/zerver/app/home.html:145 +#: templates/zerver/app/home.html:146 msgid "Nobody has talked about that yet!" msgstr "" -#: templates/zerver/app/home.html:147 templates/zerver/app/home.html:149 +#: templates/zerver/app/home.html:148 templates/zerver/app/home.html:150 msgid "Messages" msgstr "" @@ -631,48 +631,48 @@ msgstr "重新讀取" msgid "Invite users to Zulip" msgstr "邀請用戶加入 Zulip 的行列" -#: templates/zerver/app/invite_user.html:12 +#: templates/zerver/app/invite_user.html:15 msgid "Emails (one on each line or comma-separated)" msgstr "" -#: templates/zerver/app/invite_user.html:14 +#: templates/zerver/app/invite_user.html:17 msgid "One or more email addresses..." msgstr "" -#: templates/zerver/app/invite_user.html:17 +#: templates/zerver/app/invite_user.html:20 msgid "or" msgstr "" -#: templates/zerver/app/invite_user.html:17 -#: templates/zerver/app/invite_user.html:23 +#: templates/zerver/app/invite_user.html:20 +#: templates/zerver/app/invite_user.html:26 msgid "Generate invite link" msgstr "" -#: templates/zerver/app/invite_user.html:31 +#: templates/zerver/app/invite_user.html:33 msgid "User(s) join as" msgstr "" -#: templates/zerver/app/invite_user.html:34 +#: templates/zerver/app/invite_user.html:36 msgid "Members" msgstr "" -#: templates/zerver/app/invite_user.html:36 +#: templates/zerver/app/invite_user.html:38 msgid "Organization administrators" msgstr "" -#: templates/zerver/app/invite_user.html:38 +#: templates/zerver/app/invite_user.html:40 msgid "Guests" msgstr "" -#: templates/zerver/app/invite_user.html:47 +#: templates/zerver/app/invite_user.html:45 msgid "Streams they should join" msgstr "值得他們加入的頻道" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Inviting..." msgstr "正在傳送邀請" -#: templates/zerver/app/invite_user.html:54 +#: templates/zerver/app/invite_user.html:52 msgid "Invite" msgstr "邀請用戶" @@ -738,7 +738,7 @@ msgid "Navigation" msgstr "" #: templates/zerver/app/keyboard_shortcuts.html:77 -#: templates/zerver/app/left_sidebar.html:61 +#: templates/zerver/app/left_sidebar.html:56 msgid "Search streams" msgstr "搜尋頻道" @@ -940,7 +940,7 @@ msgstr "訂閱、開設或者設定頻道" msgid "Filter streams" msgstr "篩選頻道" -#: templates/zerver/app/left_sidebar.html:57 +#: templates/zerver/app/left_sidebar.html:63 msgid "All streams" msgstr "全部頻道" @@ -1140,12 +1140,12 @@ msgstr "" msgid "USERS" msgstr "" -#: templates/zerver/app/right_sidebar.html:26 -msgid "Invite more users" +#: templates/zerver/app/right_sidebar.html:28 +msgid "GROUP PMs" msgstr "" -#: templates/zerver/app/right_sidebar.html:31 -msgid "GROUP PMs" +#: templates/zerver/app/right_sidebar.html:34 +msgid "Invite more users" msgstr "" #: templates/zerver/app/search_operators.html:7 @@ -1425,37 +1425,37 @@ msgstr "" msgid "Normal users" msgstr "普通用戶" -#: templates/zerver/emails/compiled/confirm_new_email.html:10 -#: templates/zerver/emails/compiled/find_team.html:10 +#: templates/zerver/emails/compiled/confirm_new_email.html:9 +#: templates/zerver/emails/compiled/find_team.html:9 +#: templates/zerver/emails/confirm_new_email.source.html:8 +#: templates/zerver/emails/confirm_new_email.txt:1 +#: templates/zerver/emails/find_team.source.html:8 +#: templates/zerver/emails/find_team.txt:1 #, python-format -msgid "" -"\n" -" Hi %(user_name)s,\n" -" " +msgid "Hi %(user_name)s," msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:16 +#: templates/zerver/emails/compiled/confirm_new_email.html:11 +#: templates/zerver/emails/confirm_new_email.source.html:10 +#: templates/zerver/emails/confirm_new_email.txt:4 #, python-format msgid "" -"\n" -" We received a request to change the email address for the Zulip account on\n" -" %(realm_uri)s from %(old_email)s to %(new_email)s.\n" -" To confirm this change, please click below:\n" -" " +"We received a request to change the email address for the Zulip account on " +"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " +"please click below:" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:21 +#: templates/zerver/emails/compiled/confirm_new_email.html:12 #: templates/zerver/emails/confirm_new_email.source.html:11 msgid "Confirm email change" msgstr "" -#: templates/zerver/emails/compiled/confirm_new_email.html:25 +#: templates/zerver/emails/compiled/confirm_new_email.html:14 #, python-format msgid "" -"\n" -" If you did not request this change, please contact us immediately at\n" -" %(support_email)s.\n" -" " +"If you did not request this change, please contact us immediately at %(support_email)s." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:10 @@ -1470,48 +1470,50 @@ msgid "Click the button below to complete registration." msgstr "" #: templates/zerver/emails/compiled/confirm_registration.html:14 -#: templates/zerver/emails/compiled/invitation.html:19 -#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/invitation.html:16 +#: templates/zerver/emails/compiled/invitation_reminder.html:15 #: templates/zerver/emails/confirm_registration.source.html:13 #: templates/zerver/emails/invitation.source.html:15 #: templates/zerver/emails/invitation_reminder.source.html:14 msgid "Complete registration" msgstr "" -#: templates/zerver/emails/compiled/confirm_registration.html:17 -#: templates/zerver/emails/compiled/invitation.html:22 -#: templates/zerver/emails/compiled/invitation_reminder.html:24 -#: templates/zerver/emails/compiled/realm_reactivation.html:31 +#: templates/zerver/emails/compiled/confirm_registration.html:16 +#: templates/zerver/emails/compiled/invitation.html:19 +#: templates/zerver/emails/compiled/invitation_reminder.html:20 +#: templates/zerver/emails/compiled/realm_reactivation.html:20 #, python-format msgid "" -"\n" -" Contact us any time at\n" -" %(support_email)s\n" -" if you run into trouble, have any feedback, or just want to chat!\n" -" " +"Contact us any time at %(support_email)s if " +"you run into trouble, have any feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:15 +#: templates/zerver/emails/compiled/find_team.html:11 +#: templates/zerver/emails/find_team.source.html:10 +#: templates/zerver/emails/find_team.txt:4 #, python-format msgid "" -"You can log in to your Zulip organization, %(realm_name)s,\n" -"at the following link:" +"You can log in to your Zulip organization, %(realm_name)s, at the following " +"link:" msgstr "" -#: templates/zerver/emails/compiled/find_team.html:26 +#: templates/zerver/emails/compiled/find_team.html:21 #: templates/zerver/emails/find_team.source.html:20 #: templates/zerver/emails/find_team.txt:8 #, python-format msgid "The email address associated with your account is %(email)s." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:28 +#: templates/zerver/emails/compiled/find_team.html:23 +#: templates/zerver/emails/find_team.source.html:22 +#: templates/zerver/emails/find_team.txt:11 msgid "" -"If you have trouble logging in, please contact Zulip support by replying to\n" +"If you have trouble logging in, please contact Zulip support by replying to " "this email." msgstr "" -#: templates/zerver/emails/compiled/find_team.html:31 +#: templates/zerver/emails/compiled/find_team.html:25 #: templates/zerver/emails/find_team.source.html:24 #: templates/zerver/emails/find_team.txt:14 msgid "Thanks for using Zulip!" @@ -1524,83 +1526,81 @@ msgid "Welcome to Zulip!" msgstr "" #: templates/zerver/emails/compiled/followup_day1.html:13 +#: templates/zerver/emails/followup_day1.source.html:12 #, python-format -msgid "" -"\n" -" You've created the new Zulip organization %(realm_name)s.\n" -" " +msgid "You've created the new Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:17 +#: templates/zerver/emails/compiled/followup_day1.html:15 +#: templates/zerver/emails/followup_day1.source.html:14 #, python-format -msgid "" -"\n" -" You've joined the Zulip organization %(realm_name)s.\n" -" " +msgid "You've joined the Zulip organization %(realm_name)s." msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:24 +#: templates/zerver/emails/compiled/followup_day1.html:20 #: templates/zerver/emails/followup_day1.source.html:19 #: templates/zerver/emails/followup_day1.txt:10 msgid "Your account details:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:26 +#: templates/zerver/emails/compiled/followup_day1.html:22 #: templates/zerver/emails/followup_day1.source.html:20 #: templates/zerver/emails/followup_day1.txt:11 msgid "Organization URL:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:30 +#: templates/zerver/emails/compiled/followup_day1.html:26 #: templates/zerver/emails/followup_day1.source.html:23 #: templates/zerver/emails/followup_day1.txt:14 msgid "Username:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:33 +#: templates/zerver/emails/compiled/followup_day1.html:29 #: templates/zerver/emails/followup_day1.source.html:25 #: templates/zerver/emails/followup_day1.txt:16 msgid "Use your LDAP account to login" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:37 +#: templates/zerver/emails/compiled/followup_day1.html:33 #: templates/zerver/emails/followup_day1.source.html:28 #: templates/zerver/emails/followup_day1.txt:19 msgid "Email:" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:40 +#: templates/zerver/emails/compiled/followup_day1.html:36 msgid "" -"\n" -" (you'll need these to sign in to the mobile and desktop apps)\n" -" " +"(you'll need these to sign in to the mobile and desktop " +"apps)" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:47 +#: templates/zerver/emails/compiled/followup_day1.html:41 #, python-format msgid "" -"\n" -" Check out our guide for admins, become a Zulip pro with a\n" -" few keyboard shortcuts, or dive right in!\n" -" " +"Check out our guide for admins, become a Zulip pro with a " +"few keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:52 +#: templates/zerver/emails/compiled/followup_day1.html:43 #, python-format msgid "" -"\n" -" Learn more about Zulip, become a pro with a few\n" -" keyboard shortcuts, or dive right in!\n" -" " +"Learn more about Zulip, become a pro with a few " +"keyboard shortcuts, or dive right in!" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:60 +#: templates/zerver/emails/compiled/followup_day1.html:48 #: templates/zerver/emails/followup_day1.source.html:42 #: templates/zerver/emails/followup_day1.txt:31 msgid "Cheers," msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:61 +#: templates/zerver/emails/compiled/followup_day1.html:49 #: templates/zerver/emails/compiled/notify_change_in_email.html:15 #: templates/zerver/emails/followup_day1.source.html:43 #: templates/zerver/emails/followup_day1.txt:32 @@ -1609,14 +1609,14 @@ msgstr "" msgid "Team Zulip" msgstr "" -#: templates/zerver/emails/compiled/followup_day1.html:65 +#: templates/zerver/emails/compiled/followup_day1.html:53 msgid "" -"\n" -" PS: Follow us on Twitter,\n" -" star us on GitHub, or\n" -" chat with us live on the\n" -" Zulip community server!\n" -" " +"PS: Follow us on Twitter, star us on " +"GitHub, or chat with us live on the Zulip community server!" msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:9 @@ -1668,7 +1668,7 @@ msgid "Take it for a spin now." msgstr "" #: templates/zerver/emails/compiled/followup_day2.html:28 -#: templates/zerver/emails/compiled/notify_new_login.html:51 +#: templates/zerver/emails/compiled/notify_new_login.html:42 #: templates/zerver/emails/followup_day2.source.html:27 #: templates/zerver/emails/followup_day2.txt:16 #: templates/zerver/emails/notify_new_login.source.html:40 @@ -1684,7 +1684,7 @@ msgid "Zulip" msgstr "Zulip" #: templates/zerver/emails/compiled/followup_day2.html:34 -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/followup_day2.source.html:33 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Manage email preferences" @@ -1704,14 +1704,14 @@ msgstr "" #: templates/zerver/emails/compiled/invitation.html:12 #, python-format msgid "" -"\n" -" %(referrer_full_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"%(referrer_full_name)s (%(referrer_email)s)wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation.html:18 -#: templates/zerver/emails/compiled/invitation_reminder.html:19 +#: templates/zerver/emails/compiled/invitation.html:15 +#: templates/zerver/emails/compiled/invitation_reminder.html:14 #: templates/zerver/emails/invitation.source.html:14 #: templates/zerver/emails/invitation_reminder.source.html:13 msgid "To get started, click the button below." @@ -1723,17 +1723,16 @@ msgstr "" msgid "Hi again," msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:12 +#: templates/zerver/emails/compiled/invitation_reminder.html:11 #, python-format msgid "" -"\n" -" This is a friendly reminder that\n" -" %(referrer_name)s (%(referrer_email)s)\n" -" wants you to join them on Zulip — the team communication tool designed for productivity.\n" -" " +"This is a friendly reminder that %(referrer_name)s (%(referrer_email)s) wants you to join them on " +"Zulip — the team communication tool designed for productivity." msgstr "" -#: templates/zerver/emails/compiled/invitation_reminder.html:23 +#: templates/zerver/emails/compiled/invitation_reminder.html:19 #: templates/zerver/emails/invitation_reminder.source.html:18 #: templates/zerver/emails/invitation_reminder.txt:8 msgid "This is the last reminder you'll receive for this invitation." @@ -1763,10 +1762,11 @@ msgid "Best," msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:4 +#: templates/zerver/emails/notify_new_login.source.html:4 #, python-format msgid "" "Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s " +"%(user_email)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:13 @@ -1775,178 +1775,157 @@ msgstr "" msgid "We noticed a recent login for the following Zulip account." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:17 +#: templates/zerver/emails/compiled/notify_new_login.html:18 #, python-format msgid "" -"\n" -" Organization: %(realm_uri)s\n" -" " +"Organization: %(realm_uri)s" msgstr "" #: templates/zerver/emails/compiled/notify_new_login.html:21 #, python-format msgid "" -"\n" -" Email: %(user_email)s\n" -" " +"Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:25 +#: templates/zerver/emails/compiled/notify_new_login.html:24 +#: templates/zerver/emails/notify_new_login.source.html:22 +#: templates/zerver/emails/notify_new_login.txt:7 #, python-format -msgid "" -"\n" -" Time: %(login_time)s\n" -" " +msgid "Time: %(login_time)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:29 +#: templates/zerver/emails/compiled/notify_new_login.html:27 +#: templates/zerver/emails/notify_new_login.source.html:25 +#: templates/zerver/emails/notify_new_login.txt:9 #, python-format -msgid "" -"\n" -" Device: %(device_browser)s on %(device_os)s.\n" -" " +msgid "Device: %(device_browser)s on %(device_os)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:33 +#: templates/zerver/emails/compiled/notify_new_login.html:30 +#: templates/zerver/emails/notify_new_login.source.html:28 +#: templates/zerver/emails/notify_new_login.txt:11 #, python-format -msgid "" -"\n" -" IP address: %(device_ip)s\n" -" " +msgid "IP address: %(device_ip)s" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:40 +#: templates/zerver/emails/compiled/notify_new_login.html:35 #: templates/zerver/emails/notify_new_login.source.html:33 #: templates/zerver/emails/notify_new_login.txt:14 msgid "If this was you, great! There's nothing else you need to do." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:43 +#: templates/zerver/emails/compiled/notify_new_login.html:38 #, python-format msgid "" -"\n" -" If you do not recognize this login, or think your account may have been compromised, please\n" -" reset your password\n" -" or contact us immediately at %(support_email)s.\n" -" " +"If you do not recognize this login, or think your account may have been " +"compromised, please reset " +"your password or contact us immediately at %(support_email)s." msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:52 +#: templates/zerver/emails/compiled/notify_new_login.html:43 #: templates/zerver/emails/notify_new_login.source.html:41 #: templates/zerver/emails/notify_new_login.txt:20 msgid "Zulip Security" msgstr "" -#: templates/zerver/emails/compiled/notify_new_login.html:57 +#: templates/zerver/emails/compiled/notify_new_login.html:48 #: templates/zerver/emails/notify_new_login.source.html:46 msgid "Unsubscribe from login notifications" msgstr "" #: templates/zerver/emails/compiled/password_reset.html:10 +#: templates/zerver/emails/password_reset.source.html:9 +#: templates/zerver/emails/password_reset.txt:1 #, python-format msgid "" -"\n" -" Somebody (possibly you) requested a new password for the Zulip account %(email)s on %(realm_uri)s.\n" -" " +"Somebody (possibly you) requested a new password for the Zulip account " +"%(email)s on %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:16 +#: templates/zerver/emails/compiled/password_reset.html:14 #: templates/zerver/emails/password_reset.source.html:13 msgid "Click the button below to reset your password." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:17 +#: templates/zerver/emails/compiled/password_reset.html:15 #: templates/zerver/emails/password_reset.source.html:14 msgid "Reset password" msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/compiled/password_reset.html:20 #, python-format msgid "" -"\n" -" You previously had an account on %(realm_uri)s, but it has been deactivated.\n" -" You can contact an organization administrator to\n" -" reactivate your account.\n" -" " +"You previously had an account on %(realm_uri)s, but it has been deactivated." +" You can contact an organization administrator to reactivate your " +"account." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:28 -msgid "" -"\n" -" You do not have an account in that Zulip organization.\n" -" " +#: templates/zerver/emails/compiled/password_reset.html:22 +#: templates/zerver/emails/password_reset.source.html:21 +#: templates/zerver/emails/password_reset.txt:10 +msgid "You do not have an account in that Zulip organization." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:35 +#: templates/zerver/emails/compiled/password_reset.html:27 #: templates/zerver/emails/password_reset.source.html:26 #: templates/zerver/emails/password_reset.txt:15 msgid "You do have active accounts in the following organization(s)." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:42 +#: templates/zerver/emails/compiled/password_reset.html:34 +#: templates/zerver/emails/password_reset.source.html:32 +#: templates/zerver/emails/password_reset.txt:20 msgid "" -"\n" -" You can try logging in or resetting your password in the organization(s) above.\n" -" " +"You can try logging in or resetting your password in the organization(s) " +"above." msgstr "" -#: templates/zerver/emails/compiled/password_reset.html:49 +#: templates/zerver/emails/compiled/password_reset.html:40 +#: templates/zerver/emails/password_reset.source.html:38 +#: templates/zerver/emails/password_reset.txt:24 msgid "" -"\n" -" If you do not recognize this activity, you can safely ignore this email.\n" -" " +"If you do not recognize this activity, you can safely ignore this email." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:10 +#: templates/zerver/emails/compiled/realm_reactivation.html:9 +#: templates/zerver/emails/realm_reactivation.source.html:8 +#: templates/zerver/emails/realm_reactivation.txt:1 +#, python-format +msgid "Dear former administrators of %(realm_name)s," +msgstr "" + +#: templates/zerver/emails/compiled/realm_reactivation.html:11 +#: templates/zerver/emails/realm_reactivation.source.html:10 +#: templates/zerver/emails/realm_reactivation.txt:4 #, python-format msgid "" -"\n" -" Dear former administrators of %(realm_name)s,\n" -" " +"One of your administrators requested reactivation of the previously " +"deactivated Zulip organization hosted at %(realm_uri)s." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:15 -#, python-format -msgid "" -"\n" -" One of your administrators requested reactivation of the\n" -" previously deactivated Zulip organization hosted at %(realm_uri)s.\n" -" " -msgstr "" - -#: templates/zerver/emails/compiled/realm_reactivation.html:21 +#: templates/zerver/emails/compiled/realm_reactivation.html:14 #: templates/zerver/emails/realm_reactivation.source.html:13 msgid "Click the button below to reactivate your organization." msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:22 +#: templates/zerver/emails/compiled/realm_reactivation.html:15 #: templates/zerver/emails/realm_reactivation.source.html:14 msgid "Reactivate organization" msgstr "" -#: templates/zerver/emails/compiled/realm_reactivation.html:25 +#: templates/zerver/emails/compiled/realm_reactivation.html:18 +#: templates/zerver/emails/realm_reactivation.source.html:17 +#: templates/zerver/emails/realm_reactivation.txt:10 msgid "" -"\n" -" If the request was in error, you can take no action and this link\n" -" will expire in 24 hours.\n" -" " -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:8 -#: templates/zerver/emails/confirm_new_email.txt:1 -#: templates/zerver/emails/find_team.source.html:8 -#: templates/zerver/emails/find_team.txt:1 -#, python-format -msgid "Hi %(user_name)s," -msgstr "" - -#: templates/zerver/emails/confirm_new_email.source.html:10 -#: templates/zerver/emails/confirm_new_email.txt:4 -#, python-format -msgid "" -"We received a request to change the email address for the Zulip account on " -"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, " -"please click below:" +"If the request was in error, you can take no action and this link will " +"expire in 24 hours." msgstr "" #: templates/zerver/emails/confirm_new_email.source.html:13 @@ -1994,35 +1973,10 @@ msgid "" "feedback, or just want to chat!" msgstr "" -#: templates/zerver/emails/find_team.source.html:10 -#: templates/zerver/emails/find_team.txt:4 -#, python-format -msgid "" -"You can log in to your Zulip organization, %(realm_name)s, at the following " -"link:" -msgstr "" - -#: templates/zerver/emails/find_team.source.html:22 -#: templates/zerver/emails/find_team.txt:11 -msgid "" -"If you have trouble logging in, please contact Zulip support by replying to " -"this email." -msgstr "" - #: templates/zerver/emails/find_team.subject.txt:1 msgid "Your Zulip login page" msgstr "" -#: templates/zerver/emails/followup_day1.source.html:12 -#, python-format -msgid "You've created the new Zulip organization %(realm_name)s." -msgstr "" - -#: templates/zerver/emails/followup_day1.source.html:14 -#, python-format -msgid "You've joined the Zulip organization %(realm_name)s." -msgstr "" - #: templates/zerver/emails/followup_day1.source.html:30 msgid "" "(you'll need these to sign in to the ." msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:4 -#, python-format -msgid "" -"Organization: %(organization_url)s Time: %(login_time)s Email: " -"%(user_email)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:16 #, python-format msgid "Organization: %(realm_uri)s" @@ -2242,24 +2189,6 @@ msgstr "" msgid "Email: %(user_email)s" msgstr "" -#: templates/zerver/emails/notify_new_login.source.html:22 -#: templates/zerver/emails/notify_new_login.txt:7 -#, python-format -msgid "Time: %(login_time)s" -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:25 -#: templates/zerver/emails/notify_new_login.txt:9 -#, python-format -msgid "Device: %(device_browser)s on %(device_os)s." -msgstr "" - -#: templates/zerver/emails/notify_new_login.source.html:28 -#: templates/zerver/emails/notify_new_login.txt:11 -#, python-format -msgid "IP address: %(device_ip)s" -msgstr "" - #: templates/zerver/emails/notify_new_login.source.html:36 #, python-format msgid "" @@ -2293,14 +2222,6 @@ msgid "" "%(support_email)s." msgstr "" -#: templates/zerver/emails/password_reset.source.html:9 -#: templates/zerver/emails/password_reset.txt:1 -#, python-format -msgid "" -"Somebody (possibly you) requested a new password for the Zulip account " -"%(email)s on %(realm_uri)s." -msgstr "" - #: templates/zerver/emails/password_reset.source.html:19 #, python-format msgid "" @@ -2310,24 +2231,6 @@ msgid "" "account." msgstr "" -#: templates/zerver/emails/password_reset.source.html:21 -#: templates/zerver/emails/password_reset.txt:10 -msgid "You do not have an account in that Zulip organization." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:32 -#: templates/zerver/emails/password_reset.txt:20 -msgid "" -"You can try logging in or resetting your password in the organization(s) " -"above." -msgstr "" - -#: templates/zerver/emails/password_reset.source.html:38 -#: templates/zerver/emails/password_reset.txt:24 -msgid "" -"If you do not recognize this activity, you can safely ignore this email." -msgstr "" - #: templates/zerver/emails/password_reset.subject.txt:1 #, python-format msgid "Password reset request for %(realm_name)s" @@ -2344,27 +2247,6 @@ msgid "" " You can contact an organization administrator to reactivate your account." msgstr "" -#: templates/zerver/emails/realm_reactivation.source.html:8 -#: templates/zerver/emails/realm_reactivation.txt:1 -#, python-format -msgid "Dear former administrators of %(realm_name)s," -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:10 -#: templates/zerver/emails/realm_reactivation.txt:4 -#, python-format -msgid "" -"One of your administrators requested reactivation of the previously " -"deactivated Zulip organization hosted at %(realm_uri)s." -msgstr "" - -#: templates/zerver/emails/realm_reactivation.source.html:17 -#: templates/zerver/emails/realm_reactivation.txt:10 -msgid "" -"If the request was in error, you can take no action and this link will " -"expire in 24 hours." -msgstr "" - #: templates/zerver/emails/realm_reactivation.txt:7 msgid "Click the link below to reactivate your organization." msgstr "" @@ -2988,7 +2870,7 @@ msgid "" "to register for accounts in this organization." msgstr "" -#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4734 +#: zerver/forms.py:160 zerver/forms.py:173 zerver/lib/actions.py:4754 msgid "Please use your real email address." msgstr "" @@ -3042,7 +2924,7 @@ msgstr "" msgid "hello" msgstr "" -#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5076 +#: zerver/lib/actions.py:1805 zerver/lib/actions.py:5096 #: zerver/views/messages.py:1225 zerver/views/messages.py:1232 #: zerver/views/messages.py:1255 msgid "User not authorized for this query" @@ -3127,120 +3009,120 @@ msgstr "" msgid "Widgets: %s" msgstr "" -#: zerver/lib/actions.py:2495 +#: zerver/lib/actions.py:2515 msgid "Subscriber data is not available for this stream" msgstr "" -#: zerver/lib/actions.py:2502 +#: zerver/lib/actions.py:2522 msgid "Unable to retrieve subscribers for private stream" msgstr "" -#: zerver/lib/actions.py:3583 +#: zerver/lib/actions.py:3603 #, python-format msgid "Invalid default stream group %s" msgstr "" -#: zerver/lib/actions.py:3639 zerver/lib/actions.py:3658 +#: zerver/lib/actions.py:3659 zerver/lib/actions.py:3678 #, python-format msgid "" "'%(stream_name)s' is a default stream and cannot be added to " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3646 +#: zerver/lib/actions.py:3666 #, python-format msgid "Default stream group '%(group_name)s' already exists" msgstr "" -#: zerver/lib/actions.py:3662 +#: zerver/lib/actions.py:3682 #, python-format msgid "" "Stream '%(stream_name)s' is already present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3674 +#: zerver/lib/actions.py:3694 #, python-format msgid "" "Stream '%(stream_name)s' is not present in default stream group " "'%(group_name)s'" msgstr "" -#: zerver/lib/actions.py:3684 +#: zerver/lib/actions.py:3704 #, python-format msgid "This default stream group is already named '%s'" msgstr "" -#: zerver/lib/actions.py:3687 +#: zerver/lib/actions.py:3707 #, python-format msgid "Default stream group '%s' already exists" msgstr "" -#: zerver/lib/actions.py:3999 +#: zerver/lib/actions.py:4019 #, python-format msgid "Invalid flag: '%s'" msgstr "" -#: zerver/lib/actions.py:4015 zerver/lib/actions.py:4017 +#: zerver/lib/actions.py:4035 zerver/lib/actions.py:4037 #: zerver/lib/message.py:503 zerver/lib/message.py:509 msgid "Invalid message(s)" msgstr "" -#: zerver/lib/actions.py:4727 +#: zerver/lib/actions.py:4747 msgid "Invalid address." msgstr "" -#: zerver/lib/actions.py:4732 +#: zerver/lib/actions.py:4752 msgid "Outside your domain." msgstr "" -#: zerver/lib/actions.py:4736 zerver/views/users.py:476 +#: zerver/lib/actions.py:4756 zerver/views/users.py:476 msgid "Email addresses containing + are not allowed." msgstr "" -#: zerver/lib/actions.py:4741 +#: zerver/lib/actions.py:4761 msgid "Already has an account." msgstr "" -#: zerver/lib/actions.py:4767 +#: zerver/lib/actions.py:4787 #, python-format msgid "" "You do not have enough remaining invites. Please contact %s to have your " "limit raised. No invitations were sent." msgstr "" -#: zerver/lib/actions.py:4814 +#: zerver/lib/actions.py:4834 msgid "" "Your account is too new to send invites for this organization. Ask an " "organization admin, or a more experienced user." msgstr "" -#: zerver/lib/actions.py:4834 +#: zerver/lib/actions.py:4854 msgid "Some emails did not validate, so we didn't send any invitations." msgstr "" -#: zerver/lib/actions.py:4839 +#: zerver/lib/actions.py:4859 msgid "We weren't able to invite anyone." msgstr "" -#: zerver/lib/actions.py:4863 +#: zerver/lib/actions.py:4883 msgid "" "Some of those addresses are already using Zulip, so we didn't send them an " "invitation. We did send invitations to everyone else!" msgstr "" -#: zerver/lib/actions.py:5222 +#: zerver/lib/actions.py:5242 msgid "Invalid order mapping." msgstr "" -#: zerver/lib/actions.py:5272 zerver/lib/users.py:231 +#: zerver/lib/actions.py:5292 zerver/lib/users.py:231 #: zerver/views/custom_profile_fields.py:85 #: zerver/views/custom_profile_fields.py:109 #, python-brace-format msgid "Field id {id} not found." msgstr "" -#: zerver/lib/actions.py:5293 zerver/lib/actions.py:5304 +#: zerver/lib/actions.py:5313 zerver/lib/actions.py:5324 #, python-format msgid "User group '%s' already exists." msgstr "" @@ -3250,7 +3132,7 @@ msgid "Missing topic" msgstr "" #: zerver/lib/addressee.py:49 zerver/views/messages.py:1411 -#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:46 +#: zerver/webhooks/ifttt/view.py:22 zerver/webhooks/zapier/view.py:53 msgid "Topic can't be empty" msgstr "" @@ -3279,7 +3161,7 @@ msgid "" "An error occurred while deleting the attachment. Please try again later." msgstr "" -#: zerver/lib/bot_lib.py:87 +#: zerver/lib/bot_lib.py:86 msgid "Message must have recipients!" msgstr "" @@ -3499,26 +3381,22 @@ msgstr "" msgid "Missing content" msgstr "" -#: zerver/lib/push_notifications.py:218 +#: zerver/lib/push_notifications.py:235 #, python-format msgid "Invalid GCM option to bouncer: priority %r" msgstr "" -#: zerver/lib/push_notifications.py:225 +#: zerver/lib/push_notifications.py:242 #, python-format msgid "Invalid GCM options to bouncer: %s" msgstr "" #. error -#: zerver/lib/push_notifications.py:399 zilencer/views.py:118 +#: zerver/lib/push_notifications.py:416 zilencer/views.py:118 msgid "Token does not exist" msgstr "" -#: zerver/lib/remote_server.py:60 -msgid "Received 500 from push notification bouncer" -msgstr "" - -#: zerver/lib/remote_server.py:68 +#: zerver/lib/remote_server.py:70 #, python-format msgid "Push notifications bouncer error: %s" msgstr "" @@ -3902,7 +3780,7 @@ msgstr "" msgid "No REMOTE_USER set." msgstr "" -#: zerver/views/auth.py:205 zerver/views/auth.py:296 +#: zerver/views/auth.py:205 zerver/views/auth.py:298 msgid "Invalid OTP" msgstr "" @@ -3930,43 +3808,43 @@ msgstr "" msgid "Wrong subdomain" msgstr "" -#: zerver/views/auth.py:710 zerver/views/auth.py:741 +#: zerver/views/auth.py:723 zerver/views/auth.py:754 msgid "Dev environment not enabled." msgstr "" -#: zerver/views/auth.py:726 zerver/views/auth.py:774 +#: zerver/views/auth.py:739 zerver/views/auth.py:787 msgid "This organization has been deactivated." msgstr "" -#: zerver/views/auth.py:729 zerver/views/auth.py:771 +#: zerver/views/auth.py:742 zerver/views/auth.py:784 msgid "Your account has been disabled." msgstr "" -#: zerver/views/auth.py:732 +#: zerver/views/auth.py:745 msgid "This user is not registered." msgstr "" -#: zerver/views/auth.py:777 +#: zerver/views/auth.py:790 msgid "Password auth is disabled in your team." msgstr "" -#: zerver/views/auth.py:783 +#: zerver/views/auth.py:796 msgid "This user is not registered; do so from a browser." msgstr "" -#: zerver/views/auth.py:785 zerver/views/auth.py:875 +#: zerver/views/auth.py:798 zerver/views/auth.py:888 msgid "Your username or password is incorrect." msgstr "" -#: zerver/views/auth.py:810 +#: zerver/views/auth.py:823 msgid "Invalid subdomain" msgstr "" -#: zerver/views/auth.py:816 +#: zerver/views/auth.py:829 msgid "Subdomain required" msgstr "" -#: zerver/views/auth.py:883 +#: zerver/views/auth.py:896 msgid "GOOGLE_CLIENT_ID is not configured" msgstr "" @@ -4490,7 +4368,7 @@ msgstr "" msgid "Missing required data" msgstr "" -#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:49 +#: zerver/webhooks/ifttt/view.py:25 zerver/webhooks/zapier/view.py:56 msgid "Content can't be empty" msgstr "" diff --git a/static/locale/zh_Hant/translations.json b/static/locale/zh_Hant/translations.json index 67f4d10682..fd462ed600 100644 --- a/static/locale/zh_Hant/translations.json +++ b/static/locale/zh_Hant/translations.json @@ -456,6 +456,7 @@ "Search results": "", "Search subscribers": "", "Search uploads...": "", + "Searched for:": "", "See the rest of this message": "", "Select date and time": "", "Select default language": "",