diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index a654dd709..c21b68326 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -21,20 +21,27 @@ Encryption/Password: Password
 Encryption/RepeatPassword: Repeat password
 Encryption/PasswordNoMatch: Passwords do not match
 Encryption/SetPassword: Set password
+Error/Caption: Error
+Error/Filter: Filter error
+Error/FilterSyntax: Syntax error in filter expression
+Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
+Error/LoadingPluginLibrary: Error loading plugin library
+Error/RecursiveTransclusion: Recursive transclusion error in transclude widget
+Error/RetrievingSkinny: Error retrieving skinny tiddler list
+Error/SavingToTWEdit: Error saving to TWEdit
+Error/WhileSaving: Error while saving
+Error/XMLHttpRequest: XMLHttpRequest error code
 InternalJavaScriptError/Title: Internal JavaScript Error
 InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
 LazyLoadingWarning: <p>Loading external text from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: Login to TiddlySpace
 MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
 No: No
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
 OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
-RecursiveTransclusion: Recursive transclusion error in transclude widget
-Syncer/ErrorRetrievingSkinny: Error retrieving skinny tiddler list
-Syncer/LoginToTiddlySpace: Login to TiddlySpace
-Syncer/XMLHttpRequestError: XMLHttpRequest error code
 SystemTiddler/Tooltip: This is a system tiddler
 TagManager/Colour/Heading: Colour
 TagManager/Count/Heading: Count
diff --git a/core/modules/filters.js b/core/modules/filters.js
index 8fbcac587..176316189 100644
--- a/core/modules/filters.js
+++ b/core/modules/filters.js
@@ -121,7 +121,7 @@ exports.parseFilter = function(filterString) {
 			operandRegExp.lastIndex = p;
 			match = operandRegExp.exec(filterString);
 			if(!match || match.index !== p) {
-				throw "Syntax error in filter expression";
+				throw $tw.language.getString("Error/FilterSyntax");
 			}
 			var operation = {
 				prefix: "",
@@ -171,7 +171,7 @@ exports.compileFilter = function(filterString) {
 		filterParseTree = this.parseFilter(filterString);
 	} catch(e) {
 		return function(source,widget) {
-			return ["Filter error: " + e];
+			return [$tw.language.getString("Error/Filter") + ": " + e];
 		};
 	}
 	// Get the hashmap of filter operator functions
diff --git a/core/modules/filters/is.js b/core/modules/filters/is.js
index d27d00907..0db243044 100644
--- a/core/modules/filters/is.js
+++ b/core/modules/filters/is.js
@@ -32,7 +32,7 @@ exports.is = function(source,operator,options) {
 	if(isFilterOperator) {
 		return isFilterOperator(source,operator.prefix,options);
 	} else {
-		return ["Filter Error: Unknown operand for the 'is' filter operator"];
+		return [$tw.language.getString("Error/IsFilterOperator")];
 	}
 };
 
diff --git a/core/modules/saver-handler.js b/core/modules/saver-handler.js
index 78e0598a6..4c938f7af 100644
--- a/core/modules/saver-handler.js
+++ b/core/modules/saver-handler.js
@@ -151,7 +151,7 @@ SaverHandler.prototype.saveWiki = function(options) {
 		text = this.wiki.renderTiddler(downloadType,template,options),
 		callback = function(err) {
 			if(err) {
-				alert("Error while saving:\n\n" + err);
+				alert($tw.language.getString("Error/WhileSaving") + ":\n\n" + err);
 			} else {
 				// Clear the task queue if we're saving (rather than downloading)
 				if(method !== "download") {
diff --git a/core/modules/savers/twedit.js b/core/modules/savers/twedit.js
index 33d748f67..6907a542c 100644
--- a/core/modules/savers/twedit.js
+++ b/core/modules/savers/twedit.js
@@ -39,7 +39,7 @@ TWEditSaver.prototype.save = function(text,method,callback) {
 	// Error handler
 	var errorHandler = function(event) {
 		// Error
-		callback("Error saving to TWEdit: " + event.target.error.code);
+		callback($tw.language.getString("Error/SavingToTWEdit") + ": " + event.target.error.code);
 	};
 	// Get the file system
 	window.requestFileSystem(LocalFileSystem.PERSISTENT,0,function(fileSystem) {
diff --git a/core/modules/savers/upload.js b/core/modules/savers/upload.js
index a414582f3..bcf4b9d54 100644
--- a/core/modules/savers/upload.js
+++ b/core/modules/savers/upload.js
@@ -67,7 +67,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
 	try {
 		http.send(data);
 	} catch(ex) {
-		return callback("Error:" + ex);
+		return callback($tw.language.getString("Error/Caption") + ":" + ex);
 	}
 	$tw.notifier.display("$:/language/Notifications/Save/Starting");
 	return true;
diff --git a/core/modules/startup/browser-messaging.js b/core/modules/startup/browser-messaging.js
index 481449c74..c38ba7b85 100644
--- a/core/modules/startup/browser-messaging.js
+++ b/core/modules/startup/browser-messaging.js
@@ -78,7 +78,7 @@ exports.startup = function() {
 		if(url) {
 			loadIFrame(url,function(err,iframeInfo) {
 				if(err) {
-					alert("Error loading plugin library: " + url);
+					alert($tw.language.getString("Error/LoadingPluginLibrary") + ": " + url);
 				} else {
 					iframeInfo.domNode.contentWindow.postMessage({
 						verb: "GET",
@@ -100,7 +100,7 @@ exports.startup = function() {
 		if(url && title) {
 			loadIFrame(url,function(err,iframeInfo) {
 				if(err) {
-					alert("Error loading plugin library: " + url);
+					alert($tw.language.getString("Error/LoadingPluginLibrary") + ": " + url);
 				} else {
 					iframeInfo.domNode.contentWindow.postMessage({
 						verb: "GET",
diff --git a/core/modules/syncer.js b/core/modules/syncer.js
index de970ebec..fc25e319d 100644
--- a/core/modules/syncer.js
+++ b/core/modules/syncer.js
@@ -196,7 +196,7 @@ Syncer.prototype.syncFromServer = function() {
 			},self.pollTimerInterval);
 			// Check for errors
 			if(err) {
-				self.logger.alert($tw.language.getString("Syncer/ErrorRetrievingSkinny") + ":",err);
+				self.logger.alert($tw.language.getString("Error/RetrievingSkinny") + ":",err);
 				return;
 			}
 			// Process each incoming tiddler
@@ -275,7 +275,7 @@ Syncer.prototype.handleLoginEvent = function() {
 	this.getStatus(function(err,isLoggedIn,username) {
 		if(!isLoggedIn) {
 			$tw.passwordPrompt.createPrompt({
-				serviceName: $tw.language.getString("Syncer/LoginToTiddlySpace"),
+				serviceName: $tw.language.getString("LoginToTiddlySpace"),
 				callback: function(data) {
 					self.login(data.username,data.password,function(err,isLoggedIn) {
 						self.syncFromServer();
diff --git a/core/modules/utils/dom/http.js b/core/modules/utils/dom/http.js
index 5e56e54e9..990109249 100644
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@@ -45,7 +45,7 @@ exports.httpRequest = function(options) {
 				return;
 			}
 		// Something went wrong
-		options.callback($tw.language.getString("Syncer/XMLHttpRequestError") + ": " + this.status);
+		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status);
 		}
 	};
 	// Make the request
diff --git a/core/modules/utils/pluginmaker.js b/core/modules/utils/pluginmaker.js
index 559f5aada..1fc1a3986 100644
--- a/core/modules/utils/pluginmaker.js
+++ b/core/modules/utils/pluginmaker.js
@@ -28,7 +28,7 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
 	try {
 		jsonPluginTiddler = JSON.parse(pluginTiddler.fields.text);
 	} catch(e) {
-		throw "Cannot parse plugin tiddler " + title + "\nError: " + e;
+		throw "Cannot parse plugin tiddler " + title + "\n" + $tw.language.getString("Error/Caption") + ": " + e;
 	}
 	// Get the list of tiddlers
 	var tiddlers = Object.keys(jsonPluginTiddler.tiddlers);
diff --git a/core/modules/widgets/transclude.js b/core/modules/widgets/transclude.js
index 9b3583c04..7af61fc8e 100755
--- a/core/modules/widgets/transclude.js
+++ b/core/modules/widgets/transclude.js
@@ -68,7 +68,7 @@ TranscludeWidget.prototype.execute = function() {
 			parseTreeNodes = [{type: "element", tag: "span", attributes: {
 				"class": {type: "string", value: "tc-error"}
 			}, children: [
-				{type: "text", text: $tw.language.getString("RecursiveTransclusion")}
+				{type: "text", text: $tw.language.getString("Error/RecursiveTransclusion")}
 			]}];
 		}
 	}
diff --git a/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid b/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid
index 146d1bed0..e9213a869 100644
--- a/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid
+++ b/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid
@@ -1,7 +1,7 @@
 caption: Utilisation basique
 created: 20141129201509859
 fr-title: Transclusion — utilisation basique
-modified: 20150624093230889
+modified: 20160517071012115
 tags: [[Transclusion in WikiText]]
 title: Transclusion Basic Usage
 type: text/vnd.tiddlywiki
@@ -35,7 +35,7 @@ Le tiddler en cours a été modifié le {{!!modified}}
 
 ! Erreurs Récursives
 
-Notez que l'utilisation de ``{{!!text}}`` ou ``{{}}`` engendre le message d'erreur (//Recursive transclusion error in transclude widget//), car il n'y a aucun sens à inclure le contenu du tiddler courant dans le contenu du tiddler courant (c.à.d, en lui-même). Chaque fois que vous rencontrez ce message d'erreur, cela voudra dire que vous essayez d'inclure quelque chose en lui-même, directement ou indirectement (par exemple si le tiddler A transclut le tiddler B qui transclut le tiddler C qui, à son tour, transclut le tiddler A).
+Notez que l'utilisation de ``{{!!text}}`` ou ``{{}}`` engendre le message d'erreur (//Erreur dans le widget transclude : transclusion récursive//), car il n'y a aucun sens à inclure le contenu du tiddler courant dans le contenu du tiddler courant (c.à.d, en lui-même). Chaque fois que vous rencontrez ce message d'erreur, cela voudra dire que vous essayez d'inclure quelque chose en lui-même, directement ou indirectement (par exemple si le tiddler A transclut le tiddler B qui transclut le tiddler C qui, à son tour, transclut le tiddler A).
 
 ! En savoir plus
 
diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids
index 0b1668dd6..5e951ef7b 100644
--- a/languages/fr-FR/Misc.multids
+++ b/languages/fr-FR/Misc.multids
@@ -20,20 +20,20 @@ Encryption/Password: Mot de passe
 Encryption/RepeatPassword: Répéter le mot de passe
 Encryption/PasswordNoMatch: Les mots de passe ne correspondent pas
 Encryption/SetPassword: Définir ce mot de passe 
+Error/RecursiveTransclusion: Erreur dans le widget //transclude// : transclusion récursive
+Error/RetrievingSkinny: Erreur pendant la récupération de la liste des tiddlers (dégrossis)
+Error/XMLHttpRequest: Code d'erreur XMLHttpRequest
 InternalJavaScriptError/Title: Erreur interne JavaScript
 InternalJavaScriptError/Hint: C'est assez embarrassant. Il est recommandé de rafraîchir l'affichage de votre navigateur
 InvalidFieldName: Caractères illicites dans le nom du champ « <$text text=<<fieldName>>/> ». Les champs ne peuvent contenir que des lettres minuscules non accentuées et les caractères souligné (`_`), tiret (`-`) et point (`.`)
 LazyLoadingWarning: <p>Chargement d'un texte externe ''<$text text={{!!_canonical_uri}}/>''</p><p>Si ce message ne disparaît pas, il se peut que vous utilisiez un navigateur qui n'accepte pas les textes externes dans cette configuration. Voir http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: Identification sur TiddlySpace
 MissingTiddler/Hint: Le tiddler « <$text text=<<currentTiddler>>/> » est manquant - cliquez sur {{$:/core/images/edit-button}} pour le créer
 No: Non
 OfficialPluginLibrary: Bibliothèque officielle des plugins ~TiddlyWiki
 OfficialPluginLibrary/Hint: La bibliothèque officielle des plugins ~TiddlyWiki sur tiddlywiki.com. Plugins, thèmes et packs pour les différentes langues sont maintenus par l'équipe responsable du noyau.
 PluginReloadWarning: Merci d'enregistrer {{$:/core/ui/Buttons/save-wiki}} et de recharger {{$:/core/ui/Buttons/refresh}} pour que les changements apportés aux plugins prennent effet
 RecentChanges/DateFormat: DD MMM YYYY
-RecursiveTransclusion: Erreur dans le widget //transclude// : transclusion récursive
-Syncer/ErrorRetrievingSkinny: Erreur pendant la récupération de la liste des tiddlers (dégrossis)
-Syncer/LoginToTiddlySpace: Identification sur TiddlySpace
-Syncer/XMLHttpRequestError: Code d'erreur XMLHttpRequest
 SystemTiddler/Tooltip: Ceci est un tiddler système
 TagManager/Colour/Heading: Couleur
 TagManager/Icon/Heading: Icône
diff --git a/languages/ko-KR/Misc.multids b/languages/ko-KR/Misc.multids
index 40b2d1836..d4ddb6910 100644
--- a/languages/ko-KR/Misc.multids
+++ b/languages/ko-KR/Misc.multids
@@ -21,6 +21,16 @@ Encryption/PromptSetPassword: 이 TiddlyWiki에 대한 새 비밀번호를 설
 Encryption/RepeatPassword: 비밀번호 다시 입력
 Encryption/SetPassword: 비밀번호 설정
 Encryption/Username: 사용자 이름
+Error/Caption: 오류
+Error/Filter: 필터 오류
+Error/FilterSyntax: 필터 표현식에서 구문 오류
+Error/IsFilterOperator: 필터 오류: 'is' 필터 연산자에 대한 알 수 없는 피연산자
+Error/LoadingPluginLibrary: 플러그인 라이브러리를 불러오는 중 오류
+Error/RecursiveTransclusion: 끼워넣기 위젯에서 재귀 끼워넣기 오류
+Error/RetrievingSkinny: 날씬한 티들러 목록을 얻는 중 오류
+Error/SavingToTWEdit: TW편집으로 저장하는 데 오류
+Error/WhileSaving: 저장하는 동안 오류
+Error/XMLHttpRequest: XMLHttpRequest 오류 코드
 Exporters/CsvFile: CSV 파일
 Exporters/JsonFile: JSON 파일
 Exporters/StaticRiver: 정적 HTML
@@ -29,16 +39,13 @@ InternalJavaScriptError/Hint: 아이 창피해. 브라우저를 새로 고쳐 Ti
 InternalJavaScriptError/Title: 내부 자바스크립트 오류
 InvalidFieldName: "<$text text=<<fieldName>>/>" 필드 이름에 잘못된 문자가 있습니다. 필드는 소문자, 숫자 및 밑줄 문자 (`_`), 하이픈 (`-`) 및 마침표 (`.`)만을 포함할 수 있습니다.
 LazyLoadingWarning: <p>''<$text text={{!!_canonical_uri}}/>''에서 바깥 텍스트를 불러오는 중입니다</p><p>이 메시지가 사라지지 않으면 이 구성에서 바깥 텍스트를 지원하지 않는 브라우저를 사용하고 있을 수 있습니다. [[http://tiddlywiki.com/#ExternalText]]를 보세요</p>
+LoginToTiddlySpace: TiddlySpace에 로그인
 MissingTiddler/Hint: "<$text text=<<currentTiddler>>/>" 티들러가 없습니다 - 만드려면 {{$:/core/images/edit-button}}을 클릭하세요
 No: 아니오
 OfficialPluginLibrary: 공식 ~TiddlyWiki 플러그인 라이브러리
 OfficialPluginLibrary/Hint: tiddlywiki.com에서의 공식 ~TiddlyWiki 플러그인 라이브러리입니다. 플러그인, 테마 및 언어 팩은 코어 팀이 유지 관리하고 있습니다.
 PluginReloadWarning: 플러그인의 바뀜을 적용할 수 있도록 하려면 저장 {{$:/core/ui/Buttons/save-wiki}}하고 나서 다시 불러오세요 {{$:/core/ui/Buttons/refresh}}
 RecentChanges/DateFormat: YYYY년 MMM DD일
-RecursiveTransclusion: 끼워넣기 위젯에서 재귀 끼워넣기 오류
-Syncer/ErrorRetrievingSkinny: 날씬한 티들러 목록을 얻는 중 오류
-Syncer/LoginToTiddlySpace: TiddlySpace에 로그인
-Syncer/XMLHttpRequestError: XMLHttpRequest 오류 코드
 SystemTiddler/Tooltip: 이것은 시스템 티들러입니다
 TagManager/Colour/Heading: 색
 TagManager/Count/Heading: 횟수
diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids
index c131e9545..b919fb389 100644
--- a/languages/zh-Hans/Misc.multids
+++ b/languages/zh-Hans/Misc.multids
@@ -21,20 +21,20 @@ Encryption/PromptSetPassword: 为此 TiddlyWiki 设置一个新密码
 Encryption/RepeatPassword: 重复输入密码
 Encryption/PasswordNoMatch: 密码不匹配
 Encryption/SetPassword: 设定密码
+Error/RecursiveTransclusion: transclude 小部件中的递回嵌入错误
+Error/RetrievingSkinny: 简要条目清单撷取错误
+Error/XMLHttpRequest: XMLHttpRequest 错误代码
 InternalJavaScriptError/Title: 内部的 JavaScript 错误
 InternalJavaScriptError/Hint: 喔，真是令人尴尬。建议刷新您的浏览器，重新启动 TiddlyWiki
 InvalidFieldName: 栏位名称 "<$text text=<<fieldName>>/>" 包含无效字符，栏位名称只能包含小写字母、数字、底线 (`_`)、 连字号 (`-`) 和小数点 (`.`)
 LazyLoadingWarning: <p>正在从 ''<$text text={{!!_canonical_uri}}/>'' 加载外部条目 ...</p><p>如果此信息未消失，可能您使用的浏览器不支援此配置的外部条目。请参阅 http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: 登录 TiddlySpace
 MissingTiddler/Hint: 佚失条目 "<$text text=<<currentTiddler>>/>" - 点击 {{$:/core/images/edit-button}} 可创建此条目
 No: 否
 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式库
 OfficialPluginLibrary/Hint: 此为在 tiddlywiki.com 的 ~TiddlyWiki 官方插件程式库。由核心团队维护的插件、主题和语言包。
 PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面 {{$:/core/ui/Buttons/refresh}} 允许更改插件才能生效
 RecentChanges/DateFormat: YYYY年0MM月0DD日
-RecursiveTransclusion: transclude 小部件中的递回嵌入错误
-Syncer/ErrorRetrievingSkinny: 简要条目清单撷取错误
-Syncer/LoginToTiddlySpace: 登录 TiddlySpace
-Syncer/XMLHttpRequestError: XMLHttpRequest 错误代码
 SystemTiddler/Tooltip: 此为系统条目
 TagManager/Colour/Heading: 颜色
 TagManager/Count/Heading: 计数
diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids
index 2d7c96101..73f525de5 100644
--- a/languages/zh-Hant/Misc.multids
+++ b/languages/zh-Hant/Misc.multids
@@ -21,10 +21,14 @@ Encryption/PromptSetPassword: 為此 TiddlyWiki 設定一個新密碼
 Encryption/RepeatPassword: 重複輸入密碼
 Encryption/PasswordNoMatch: 密碼不匹配
 Encryption/SetPassword: 設定密碼
+Error/RecursiveTransclusion: transclude 小工具中的遞迴嵌入錯誤
+Error/RetrievingSkinny: 簡要條目清單擷取錯誤
+Error/XMLHttpRequest: XMLHttpRequest 錯誤代碼
 InternalJavaScriptError/Title: 內部的 JavaScript 錯誤
 InternalJavaScriptError/Hint: 喔，真是令人尷尬。建議刷新您的瀏覽器，重新啟動 TiddlyWiki
 InvalidFieldName: 欄位名稱 "<$text text=<<fieldName>>/>" 包含無效字元，欄位名稱只能包含小寫字母、數字、底線 (`_`)、 連接號 (`-`) 和小數點 (`.`)
 LazyLoadingWarning: <p>正在從 ''<$text text={{!!_canonical_uri}}/>'' 載入外部條目 ...</p><p>如果此訊息未消失，可能您使用的瀏覽器不支援此配置的外部條目。請參閱 http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: 登入 TiddlySpace
 MissingTiddler/Hint: 佚失條目 "<$text text=<<currentTiddler>>/>" - 點擊 {{$:/core/images/edit-button}} 可建立此條目
 No: 否
 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式庫
@@ -32,10 +36,6 @@ OfficialPluginLibrary/Hint: 此為在 tiddlywiki.com 的 ~TiddlyWiki 官方插
 PluginReloadWarning: 請儲存 {{$:/core/ui/Buttons/save-wiki}} 並刷新頁面 {{$:/core/ui/Buttons/refresh}} 允許更改插件才能生效
 RecentChanges/DateFormat: YYYY年0MM月0DD日
 SystemTiddler/Tooltip: 此為系統條目
-RecursiveTransclusion: transclude 小工具中的遞迴嵌入錯誤
-Syncer/ErrorRetrievingSkinny: 簡要條目清單擷取錯誤
-Syncer/LoginToTiddlySpace: 登入 TiddlySpace
-Syncer/XMLHttpRequestError: XMLHttpRequest 錯誤代碼
 TagManager/Colour/Heading: 顏色
 TagManager/Count/Heading: 計數
 TagManager/Icon/Heading: 圖示