diff --git a/static/js/compose.js b/static/js/compose.js
index ef0a020ced..3e6c2acc2f 100644
--- a/static/js/compose.js
+++ b/static/js/compose.js
@@ -897,7 +897,7 @@ $(function () {
+ " Consider deleting some previously uploaded files.");
break;
default:
- msg = i18n.t("An unknown error occured.");
+ msg = i18n.t("An unknown error occurred.");
break;
}
$("#error-msg").text(msg);
diff --git a/static/locale/bg/translations.json b/static/locale/bg/translations.json
index a499e6dad1..2ebc980a8f 100644
--- a/static/locale/bg/translations.json
+++ b/static/locale/bg/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/cs/translations.json b/static/locale/cs/translations.json
index a499e6dad1..2ebc980a8f 100644
--- a/static/locale/cs/translations.json
+++ b/static/locale/cs/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/de/translations.json b/static/locale/de/translations.json
index 5a488788e6..d9b87131a0 100644
--- a/static/locale/de/translations.json
+++ b/static/locale/de/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Scrolle immer automatisch zu neuen Nachrichten",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Stream bekannt machen",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/en/translations.json b/static/locale/en/translations.json
index a499e6dad1..2ebc980a8f 100644
--- a/static/locale/en/translations.json
+++ b/static/locale/en/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/es/translations.json b/static/locale/es/translations.json
index 727fccf500..70fa220683 100644
--- a/static/locale/es/translations.json
+++ b/static/locale/es/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Dominios permitidos",
"Already subscribed to __stream__": "Ya suscrito a __stream__",
"Always auto-scroll to new messages": "Desplazar autom\u00e1ticamente a los nuevos mensajes",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Anunciar canal",
"Any user may now add new emoji!": "\u00a1Ahora cualquier usuario puede a\u00f1adir nuevos emoticonos!",
"Any user may now create new streams!": "\u00a1Ahora cualquier usuario puede crear nuevos canales!",
diff --git a/static/locale/fr/translations.json b/static/locale/fr/translations.json
index db10ec976b..2feb06bd4f 100644
--- a/static/locale/fr/translations.json
+++ b/static/locale/fr/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/hu/translations.json b/static/locale/hu/translations.json
index a5b3123c5e..09ed425ad4 100644
--- a/static/locale/hu/translations.json
+++ b/static/locale/hu/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "M\u00e1r b\u00e1rki l\u00e9trehozhat \u00faj folyamot!",
diff --git a/static/locale/it/translations.json b/static/locale/it/translations.json
index a499e6dad1..2ebc980a8f 100644
--- a/static/locale/it/translations.json
+++ b/static/locale/it/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/ja/translations.json b/static/locale/ja/translations.json
index 6a77d3508b..9b44f79e1d 100644
--- a/static/locale/ja/translations.json
+++ b/static/locale/ja/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "\u3059\u3067\u306b__stream__\u3092\u8cfc\u8aad\u6e08\u307f\u3067\u3059\u3002",
"Always auto-scroll to new messages": "\u3044\u3064\u3082\u65b0\u3057\u3044\u30e1\u30c3\u30bb\u30fc\u30b8\u306b\u81ea\u52d5\u30b9\u30af\u30ed\u30fc\u30eb",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "\u3059\u3079\u3066\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u65b0\u3057\u3044\u30b9\u30c8\u30ea\u30fc\u30e0\u3092\u4f5c\u6210\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\uff01",
diff --git a/static/locale/ko/translations.json b/static/locale/ko/translations.json
index a499e6dad1..2ebc980a8f 100644
--- a/static/locale/ko/translations.json
+++ b/static/locale/ko/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/ml/translations.json b/static/locale/ml/translations.json
index 48b045acf1..1efdef50ef 100644
--- a/static/locale/ml/translations.json
+++ b/static/locale/ml/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "\u0d0e\u0d2a\u0d4d\u0d2a\u0d4b\u0d34\u0d41\u0d02 \u0d2a\u0d41\u0d24\u0d3f\u0d2f \u0d38\u0d28\u0d4d\u0d26\u0d47\u0d36\u0d19\u0d4d\u0d19\u0d33\u0d3f\u0d32\u0d47\u0d15\u0d4d\u0d15\u0d4d \u0d24\u0d28\u0d4d\u0d28\u0d46 \u0d38\u0d4d\u0d15\u0d4d\u0d30\u0d4b\u0d33\u0d3e\u0d15\u0d41\u0d15.",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/nl/translations.json b/static/locale/nl/translations.json
index cd03b8de55..7d0fb3d977 100644
--- a/static/locale/nl/translations.json
+++ b/static/locale/nl/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Toegestane domeinen",
"Already subscribed to __stream__": "Al geabonneerd op __stream__",
"Always auto-scroll to new messages": "Altijd automatisch doorbladeren naar nieuwe berichten",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Aankondigingenkanaal",
"Any user may now add new emoji!": "Iedere gebruiker mag nu nieuwe emojis toevoegen!",
"Any user may now create new streams!": "Iedere gebruiker mag nu nieuwe kanalen maken!",
diff --git a/static/locale/pl/translations.json b/static/locale/pl/translations.json
index b0e7585163..b6688f8993 100644
--- a/static/locale/pl/translations.json
+++ b/static/locale/pl/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Dozwolone domeny",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Ka\u017cdy/a u\u017cytkownik/czka mo\u017ce dodawa\u0107 emotikony!",
"Any user may now create new streams!": "Ka\u017cdy/a u\u017cytkownik/czka mo\u017ce tworzy\u0107 nowe w\u0105tki!",
diff --git a/static/locale/pt/translations.json b/static/locale/pt/translations.json
index a499e6dad1..2ebc980a8f 100644
--- a/static/locale/pt/translations.json
+++ b/static/locale/pt/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/ru/translations.json b/static/locale/ru/translations.json
index 43abd87b10..80d8c40097 100644
--- a/static/locale/ru/translations.json
+++ b/static/locale/ru/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "\u0423\u0436\u0435 \u043f\u043e\u0434\u043f\u0438\u0441\u0430\u043d \u043d\u0430 __stream__",
"Always auto-scroll to new messages": "\u0412\u0441\u0435\u0433\u0434\u0430 \u043f\u0440\u043e\u043a\u0440\u0443\u0447\u0438\u0432\u0430\u0442\u044c \u043a \u043d\u043e\u0432\u044b\u043c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f\u043c",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "\u0410\u043d\u043e\u043d\u0441\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u043a\u0430\u043d\u0430\u043b",
"Any user may now add new emoji!": "\u0422\u0435\u043f\u0435\u0440\u044c \u043b\u044e\u0431\u043e\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043c\u043e\u0436\u0435\u0442 \u0434\u043e\u0431\u0430\u0432\u043b\u044f\u0442\u044c \u044d\u043c\u043e\u0434\u0437\u0438!",
"Any user may now create new streams!": "\u041b\u044e\u0431\u043e\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0442\u0435\u043f\u0435\u0440\u044c \u043c\u043e\u0436\u0435\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u043a\u0430\u043d\u0430\u043b\u044b!",
diff --git a/static/locale/sr/translations.json b/static/locale/sr/translations.json
index b294c61b08..20a2f22b8a 100644
--- a/static/locale/sr/translations.json
+++ b/static/locale/sr/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/zh_CN/translations.json b/static/locale/zh_CN/translations.json
index 28f59edc51..c67f89f445 100644
--- a/static/locale/zh_CN/translations.json
+++ b/static/locale/zh_CN/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/locale/zh_Hans/translations.json b/static/locale/zh_Hans/translations.json
index 28f59edc51..c67f89f445 100644
--- a/static/locale/zh_Hans/translations.json
+++ b/static/locale/zh_Hans/translations.json
@@ -40,7 +40,7 @@
"Allowed domains": "Allowed domains",
"Already subscribed to __stream__": "Already subscribed to __stream__",
"Always auto-scroll to new messages": "Always auto-scroll to new messages",
- "An unknown error occured.": "An unknown error occured.",
+ "An unknown error occurred.": "An unknown error occurred.",
"Announce stream": "Announce stream",
"Any user may now add new emoji!": "Any user may now add new emoji!",
"Any user may now create new streams!": "Any user may now create new streams!",
diff --git a/static/third/marked/lib/marked.js b/static/third/marked/lib/marked.js
index 2189ecb612..9b954508f5 100644
--- a/static/third/marked/lib/marked.js
+++ b/static/third/marked/lib/marked.js
@@ -1441,7 +1441,7 @@ function marked(src, opt, callback) {
} catch (e) {
e.message += '\nPlease report this to https://github.com/chjj/marked.';
if ((opt || marked.defaults).silent) {
- return 'An error occured:
'
+ return 'An error occurred:
'
+ escape(e.message + '', true)
+ '';
}
diff --git a/templates/zerver/emails/new_login/new_login_alert.html b/templates/zerver/emails/new_login/new_login_alert.html
index 7f350a6c5c..08e9860951 100644
--- a/templates/zerver/emails/new_login/new_login_alert.html
+++ b/templates/zerver/emails/new_login/new_login_alert.html
@@ -15,7 +15,7 @@
|
Hello, {{ user.full_name | title }}.
- This is a notification that a new login to your Zulip account has just occured.
+ This is a notification that a new login to your Zulip account has just occurred.
Login details:
Server: {{ realm_uri }}
diff --git a/templates/zerver/emails/new_login/new_login_alert.txt b/templates/zerver/emails/new_login/new_login_alert.txt
index db494f8490..e9d59eb29c 100644
--- a/templates/zerver/emails/new_login/new_login_alert.txt
+++ b/templates/zerver/emails/new_login/new_login_alert.txt
@@ -2,7 +2,7 @@
Hello, {{ user.full_name | title }}.
-This is a notification that a new login to your Zulip account has just occured.
+This is a notification that a new login to your Zulip account has just occurred.
Login details:
Server: {{ realm_uri }}
|