diff --git a/templates/404.html b/templates/404.html index 657069a569..9abeb142a1 100644 --- a/templates/404.html +++ b/templates/404.html @@ -10,7 +10,7 @@
- +
{% if status_code == 405 %} diff --git a/templates/500.html b/templates/500.html index d812c86715..27118ef74b 100644 --- a/templates/500.html +++ b/templates/500.html @@ -15,7 +15,7 @@
- +

{{ _("Internal server error") }}

diff --git a/templates/confirmation/link_does_not_exist.html b/templates/confirmation/link_does_not_exist.html index 4a9ca4e6fb..e98786c580 100644 --- a/templates/confirmation/link_does_not_exist.html +++ b/templates/confirmation/link_does_not_exist.html @@ -7,7 +7,7 @@ {% block portico_content %}
- +

{{ _("Whoops. We couldn't find your confirmation link in the system.") }}

diff --git a/templates/confirmation/link_expired.html b/templates/confirmation/link_expired.html index d16d2eb75e..e98a917092 100644 --- a/templates/confirmation/link_expired.html +++ b/templates/confirmation/link_expired.html @@ -8,7 +8,7 @@
- +

{{ _("Whoops. The confirmation link has expired or been deactivated.") }}

diff --git a/templates/confirmation/link_malformed.html b/templates/confirmation/link_malformed.html index cd1e7bae43..6233c08442 100644 --- a/templates/confirmation/link_malformed.html +++ b/templates/confirmation/link_malformed.html @@ -7,7 +7,7 @@ {% block portico_content %}
- +

{{ _("Whoops. The confirmation link is malformed.") }}

diff --git a/templates/corporate/apps.html b/templates/corporate/apps.html index c70af88f5a..aa91385c3f 100644 --- a/templates/corporate/apps.html +++ b/templates/corporate/apps.html @@ -28,8 +28,8 @@

For download instructions, go to the desktop app install guide.

- - + +
@@ -37,7 +37,7 @@
- +
diff --git a/templates/corporate/attribution.html b/templates/corporate/attribution.html index 61dec10bc8..658870723b 100644 --- a/templates/corporate/attribution.html +++ b/templates/corporate/attribution.html @@ -21,7 +21,7 @@ diff --git a/templates/corporate/features.html b/templates/corporate/features.html index 60c65e8936..7a7db9fdfd 100644 --- a/templates/corporate/features.html +++ b/templates/corporate/features.html @@ -69,7 +69,7 @@

- +
@@ -93,7 +93,7 @@
- +

Keyboard shortcuts.

Communicate as efficiently as you use your favorite @@ -103,7 +103,7 @@ Learn more about keyboard shortcuts.

- +
diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 12da5ea70a..4ecc812ccb 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -112,7 +112,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -172,7 +172,7 @@
- +
@@ -219,7 +219,7 @@
- +
@@ -227,7 +227,7 @@
- +
@@ -300,7 +300,7 @@
- +
@@ -340,7 +340,7 @@
- +
@@ -348,7 +348,7 @@
- +
@@ -384,7 +384,7 @@
- +
@@ -421,7 +421,7 @@
- +
@@ -430,7 +430,7 @@
- +
@@ -474,7 +474,7 @@
- +
@@ -510,7 +510,7 @@
- +
diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index 71c16c2cd9..1e89cfef95 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -78,7 +78,7 @@
- +
@@ -86,7 +86,7 @@
- +
@@ -104,7 +104,7 @@
- +
@@ -142,7 +142,7 @@
- +
@@ -150,7 +150,7 @@
- +
@@ -168,7 +168,7 @@
- +
@@ -194,7 +194,7 @@
- +
@@ -203,7 +203,7 @@
- +
@@ -237,7 +237,7 @@
- +
diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index a8a68c7287..7b86487185 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -98,7 +98,7 @@
- +
@@ -106,7 +106,7 @@
- +
@@ -149,7 +149,7 @@
- +
@@ -183,7 +183,7 @@
- +
@@ -191,7 +191,7 @@
- +
@@ -209,7 +209,7 @@
- +
@@ -234,7 +234,7 @@
- +
@@ -242,7 +242,7 @@
- +
@@ -272,7 +272,7 @@
- +
diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index ef889d0543..0467200110 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -103,7 +103,7 @@
- +
@@ -111,7 +111,7 @@
- +
@@ -173,7 +173,7 @@
- +
@@ -237,7 +237,7 @@
- +
@@ -246,7 +246,7 @@
- +
@@ -318,7 +318,7 @@
- +
@@ -375,7 +375,7 @@
- +
@@ -384,7 +384,7 @@
- +
@@ -443,7 +443,7 @@
- +
@@ -513,7 +513,7 @@
- +
@@ -521,7 +521,7 @@
- +
@@ -566,7 +566,7 @@
- +
@@ -614,7 +614,7 @@
- +
diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 1c0cd51739..a08f4b2346 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -108,7 +108,7 @@
- +
@@ -116,7 +116,7 @@
- +
@@ -168,7 +168,7 @@
- +
@@ -209,7 +209,7 @@
- +
@@ -217,7 +217,7 @@
- +
@@ -274,7 +274,7 @@
- +
@@ -309,7 +309,7 @@
- +
@@ -317,7 +317,7 @@
- +
@@ -349,7 +349,7 @@
- +
diff --git a/templates/corporate/hello.html b/templates/corporate/hello.html index 8daadc3830..bb7f0264f1 100644 --- a/templates/corporate/hello.html +++ b/templates/corporate/hello.html @@ -50,7 +50,7 @@
- +
@@ -59,11 +59,11 @@
Zulip
- {{ _('Streams in Zulip') }} + {{ _('Streams in Zulip') }}
Other team chat
- {{ _('Streams in Slack') }} + {{ _('Streams in Slack') }}
@@ -74,11 +74,11 @@
Zulip
- {{ _('Topics in Zulip') }} + {{ _('Topics in Zulip') }}
Other team chat
- {{ _('Streams in Slack') }} + {{ _('Streams in Slack') }}
@@ -89,11 +89,11 @@
Zulip
- {{ _('Stream topics in Zulip') }} + {{ _('Stream topics in Zulip') }}
Other team chat
- {{ _('Streams in Slack') }} + {{ _('Streams in Slack') }}
@@ -101,27 +101,27 @@

Let’s click on “Tuesday night catering.”

- {{ _('The Tuesday night catering topic in Zulip') }} - {{ _('The Tuesday night catering topic in Zulip') }} + {{ _('The Tuesday night catering topic in Zulip') }} + {{ _('The Tuesday night catering topic in Zulip') }}

Messages in Zulip retain their context even if they’re sent hours after the conversation started:

- {{ _('The Tuesday night catering topic in Zulip') }} + {{ _('The Tuesday night catering topic in Zulip') }}
- {{ _('The Tuesday night catering topic in Zulip') }} + {{ _('The Tuesday night catering topic in Zulip') }}

Messages sent hours apart are linked in the same topic.

- {{ _('The Tuesday night catering topic in Zulip - compose box') }} + {{ _('The Tuesday night catering topic in Zulip - compose box') }}

Without topics, it’s hard to catch up efficiently, and hard to participate in conversations that started while you were away.

- {{ _('The Tuesday night catering topic in Slack') }} + {{ _('The Tuesday night catering topic in Slack') }}
- {{ _('The Tuesday night catering topic in Slack') }} + {{ _('The Tuesday night catering topic in Slack') }}

The last message about Tuesday night catering is hidden 56 messages ago. Meanwhile, you just see a mix of unrelated messages.

@@ -134,11 +134,11 @@
@@ -355,7 +355,7 @@
- +
@@ -132,7 +132,7 @@
- +
@@ -160,7 +160,7 @@
- +
@@ -180,7 +180,7 @@
- +

@@ -204,7 +204,7 @@

- +

@@ -230,7 +230,7 @@
- +

@@ -250,7 +250,7 @@

- +

diff --git a/templates/corporate/support_request.html b/templates/corporate/support_request.html index 37d556d88a..1497a8835f 100644 --- a/templates/corporate/support_request.html +++ b/templates/corporate/support_request.html @@ -31,7 +31,7 @@
diff --git a/templates/corporate/team.html b/templates/corporate/team.html index b0e57ad474..0749091308 100644 --- a/templates/corporate/team.html +++ b/templates/corporate/team.html @@ -36,7 +36,7 @@ contributors, and more than 75 with 100+ commits." %}
- +
Tim Abbott
diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html index 0278f114fd..332cdfc638 100644 --- a/templates/zerver/app/index.html +++ b/templates/zerver/app/index.html @@ -9,7 +9,7 @@ {% block customhead %} - +