diff --git a/lang/chinese-simplified.php b/lang/chinese-simplified.php
index 91b1c42..0724201 100644
--- a/lang/chinese-simplified.php
+++ b/lang/chinese-simplified.php
@@ -90,8 +90,8 @@ $text = array(
 		"Close all tabs"		=> "关闭所有选项卡",
 		"Alphabetize tabs"		=> "按字母顺序排列的选项卡",
 		"Find"				=> "搜索",
-		"in"				=> "搜索",
-		"and"				=> "替换",
+		"in"				=> "in",
+		"and"				=> "and",
 		"replace"			=> "替换",
 		"replace all"			=> "替换所有",
 		"this document"			=> "当前文件",
@@ -109,7 +109,7 @@ $text = array(
 
 	"bug-files-check" =>
 	array(
-		"Found in"			=> "发现在:"
+		"Found in"			=> "搜索到:"
 	),
 
 	"file-control" =>
@@ -209,13 +209,14 @@ $text = array(
 		"Insert tab indent"		=> "插入tab / 插入选择",
 		"Wrap with div"			=> "封装 <div>",
 		"Wrap with span"		=> "封装 <span>",
-		"Wrap unwrap p"			=> "封装 / 撤销封装 with <p>",
-		"Wrap unwrap a"			=> "封装 / 撤销封装 with <a>",
-		"Wrap unwrap b"			=> "封装 / 撤销封装 with <b>",
-		"Wrap unwrap i"			=> "封装 / 撤销封装 with <i>",
-		"Wrap unwrap strong"		=> "封装 / 撤销封装 with <strong>",
-		"Wrap unwrap em"		=> "封装 / 撤销封装 with <em>",
-		"Wrap unwrap h1..."		=> "封装 / 撤销封装 with <h1> - <h3>",
+		"Wrap unwrap p"			=> "封装 / 撤销封装 <p>",
+		"Wrap unwrap a"			=> "封装 / 撤销封装 <a>",
+		"Wrap unwrap b"			=> "封装 / 撤销封装 <b>",
+		"Wrap unwrap i"			=> "封装 / 撤销封装 <i>",
+		"Wrap unwrap strong"		=> "封装 / 撤销封装 <strong>",
+		"Wrap unwrap em"		=> "封装 / 撤销封装 <em>",
+		"Wrap unwrap li"		=> "封装 / 撤销封装 <li>",
+		"Wrap unwrap h1..."		=> "封装 / 撤销封装 <h1> - <h3>",
 		"End line with..."		=> "换行 <br>",
 		"Close tab"			=> "关闭选项卡",
 		"Select file folder"		=> "选择文件 / 文件夹",
@@ -240,6 +241,34 @@ $text = array(
 		"Cancel tasks"			=> "取消任务"
 	),
 
+	"ice-coder" =>
+	array(
+		"No text selected..."		=> "搜索中没有选中的文本",
+		"Creating Folder"		=> "正在创建文件夹",
+		"Sorry you can..."		=> "抱歉, 只能同时打开100个文件!",
+		"Opening File"			=> "正在打开文件",
+		"Enter relative file..."	=> "输入本地相对路径 (前缀 /) 或远程 URL",
+		"Getting"			=> "正在获取",
+		"Please enter the..."		=> "请输入新的名称为",
+		"Renaming to"			=> "正在重命名",
+		"Moving to"			=> "正在移动到",
+		"Deleting File"			=> "正在删除文件",
+		"Pasting File"			=> "正在粘贴文件",
+		"Sorry cannot paste..."		=> "抱歉, 无法粘贴到根路径",
+		"Nothing to paste..."		=> "粘贴失败, 请先复制一个文件 / 文件夹!",
+		"Replacing text in"		=> "正在替换文本",
+		"Cancelled tasks"		=> "取消任务",
+		"Open previous files"		=> "打开以前的文件?",
+		"Please enter your..."		=> "请输入您的 GitHub token (允许使用个人令牌或客户端令牌). 可以查看 Github Auth Token 的帮助 > 更多信息在设置窗口",
+		"This will compare..."		=> "将比较和显示你的本地目录和 GitHub repo 之间的差异. 确定吗?",
+		"Please note for..."		=> "请注意: 需要更新才能正常工作, 你需要为所有 ICEcoder 文件和文件夹设置写入和删除权限. 如果您需要恢复 ICEcoder 到这个版本, 你可以在 /tmp 目录找到它们. 点击 OK 继续使用自动升级或点击 cancel 访问 ICEcoder 网站, 您也可以到 grab 的项目首页下载 zip 来进行手动更新.",
+		"You can start..."		=> "你可以在 帮助 > 设置中启动错误报告",
+		"Error cannot find..."		=> "错误: 无法找到/进入错误文件路径",
+		"No new errors..."		=> "没有新的错误被找到",
+		"You have made..."		=> "您已做的更改未保存。您确定要关闭它而不保存吗?",
+		"Close all tabs"		=> "是否关闭所有选项卡?"
+	),
+
 	"login" =>
 	array(
 		"set password"			=> "设置密码",
@@ -267,6 +296,130 @@ $text = array(
 		"selected"			=> "选择",
 		"found in"			=> "查询结果在",
 		"Replaced"			=> "已替换"
+	),
+
+	"plugins-manager" =>
+	array(
+		"ICEcoder needs to..."		=> "ICEcoder 需要重新加载，这个插件才可以使用。现在刷新吗?",
+		"saving plugins"		=> "正在保存插件...",
+		"Cannot update config..."	=> "不能更新配置文件. 请为",
+		"and try again"			=> "设置写入权限并刷新重试",
+		"couldnt delete dir"		=> "不能删除目录",
+		"couldnt delete file"		=> "不能删除文件",
+		"plugins"			=> "插件",
+		"Guide to writing..."		=> "编写插件指南",
+		"Manage Installed"		=> "管理已安装",
+		"URL"				=> "URL",
+		"Target"			=> "目标",
+		"Timer"				=> "定时器",
+		"Update"			=> "更新",
+		"Install"			=> "安装",
+		"Uninstall"			=> "卸载",
+		"Reload after install..."	=> "安装后需要刷新"
+	),
+
+	"properties" =>
+	array(
+		"properties"			=> "属性",
+		"Size"				=> "尺寸",
+		"Modified"			=> "修改",
+		"Last access"			=> "最近访问",
+		"Type"				=> "类型",
+		"Readable Writeable"		=> "可读 / 可写",
+		"Relative path"			=> "相对路径",
+		"Absolute path"			=> "绝对路径",
+		"Contains"			=> "包含",
+		"Permissions"			=> "权限",
+		"Owner"				=> "所有者",
+		"Group"				=> "组",
+		"Public"			=> "公众",
+		"Read"				=> "读取",
+		"Write"				=> "写入",
+		"Execute"			=> "执行",
+		"Change to"			=> "更改为",
+		"update"			=> "更新"
+	),
+
+	"settings-common" =>
+	array(
+		"Your document does..."		=> "你的文档不是UTF-8编码, 它将被转换"
+	),
+
+	"settings-save-current-files" =>
+	array(
+		"Cannot update config..."	=> "不能更新配置文件. 请为",
+		"and try again"			=> "增加写入权限并再次尝试"
+	),
+
+	"settings-screen" =>
+	array(
+		"settings"			=> "设置",
+		"version"			=> "版本",
+		"website"			=> "网站",
+		"git"				=> "git",
+		"codemirror dir"		=> "codemirror 目录",
+		"codemirror version"		=> "codemirror 版本",
+		"file manager root"		=> "文件管理器的根目录ROOT",
+		"Free to use..."		=> "您可以自由使用它, 无论商业与否, 只需让我知道有任何很酷的使用或有定制的:)同样我们无任何责任和任何担保, 使用所有的责任是你的. 很多个人和公司为 ICEcoder 作出过贡献, 在此篇幅有限无法一一列举, 请访问贡献者详细列表",
+		"functionality"			=> "功能",
+		"check for updates..."		=> "启动时检查更新",
+		"auto open last..."		=> "启动时自动载入最后打开的文件",
+		"when finding in..."		=> "在查找文件时, 排除",
+		"assisting"			=> "辅助",
+		"code assist"			=> "代码辅助",
+		"visible tabs"			=> "缩进线可见",
+		"locked nav"			=> "锁定导航",
+		"tag wrapper command"		=> "标签封装命令",
+		"auto-complete on"		=> "打开自动完成",
+		"security"			=> "安全",
+		"new password"			=> "新密码",
+		"8 chars min"			=> "最少8个字符",
+		"confirm password"		=> "确认密码",
+		"banned files/folders"		=> "禁止文件 / 文件夹",
+		"banned paths"			=> "禁止路径",
+		"ip addresses"			=> "ip 地址",
+		"Slash prefixed comma..."	=> "斜线前缀, 以半角逗号分隔",
+		"Comma delimited"		=> "以半角逗号分隔",
+		"style"				=> "样式",
+		"theme"				=> "主题",
+		"line wrapping"			=> "换行",
+		"indent type"			=> "缩进类型",
+		"indent size"			=> "缩进大小",
+		"font size"			=> "字体大小",
+		"layout"			=> "布局",
+		"plugin panel aligned"		=> "插件板对齐",
+		"file manager"			=> "文件管理器",
+		"root"				=> "root",
+		"Slash prefixed"		=> "斜线前缀",
+		"bug reporting"			=> "错误报告",
+		"check in files"		=> "检查文件",
+		"every"				=> "任何",
+		"secs getting last"		=> "秒, 最后得到",
+		"lines"				=> "行",
+		"multi-user"			=> "多用户",
+		"Make sure you..."		=> "确保你没有把自己锁了",
+		"Registration"			=> "启用注册",
+		"auth token"			=> "auth token",
+		"Required to get..."		=> "如需要得到差异列表, 提交您 GitHub 上托管的 repo 等. 如果你还没有一个, 您可以使用:".PHP_EOL.PHP_EOL.
+							"- 个人访问令牌 (https://help.github.com/articles/creating-an-access-token-for-command-line-use), 或".PHP_EOL.
+							"- 完整的客户端/机密双令牌 (http://developer.github.com/v3/oauth).".PHP_EOL.PHP_EOL.
+							"我们不建议您在此处设置您的令牌, 更安全的方式是当ICEcoder要求输入时将其只保存在会话中.".PHP_EOL.PHP_EOL.
+							"然而, 如果你在一个值得信赖和安全的环境中工作, 把它设置在这里是更有效的.",
+		"Sorry cannot commit..."	=> "抱歉, 设置不能在演示模式下提交",
+		"update"			=> "更新"
+	),
+
+	"settings-update" =>
+	array(
+		"Cannot update config..."	=> "不能更新配置文件. 请为",
+		"and try again"			=> " 增加写入权限并重新尝试",
+		"and press refresh"		=> "增加写入权限并刷新"
+	),
+
+	"updater" =>
+	array(
+		"Update appears to..."		=> "更新似乎是成功的"
 	)
+	
 );
 ?>
\ No newline at end of file
diff --git a/lang/chinese-traditional.php b/lang/chinese-traditional.php
index c88f11d..58384b8 100644
--- a/lang/chinese-traditional.php
+++ b/lang/chinese-traditional.php
@@ -90,8 +90,8 @@ $text = array(
 		"Close all tabs"		=> "關閉所有選項卡",
 		"Alphabetize tabs"		=> "按字母順序排序選項卡",
 		"Find"				=> "檢索",
-		"in"				=> "檢索",
-		"and"				=> "替換",
+		"in"				=> "in",
+		"and"				=> "and",
 		"replace"			=> "替換",
 		"replace all"			=> "替換所有",
 		"this document"			=> "當前文件",
@@ -209,13 +209,14 @@ $text = array(
 		"Insert tab indent"		=> "插入tab / 插入選擇",
 		"Wrap with div"			=> "封裝 <div>",
 		"Wrap with span"		=> "封裝 <span>",
-		"Wrap unwrap p"			=> "封裝 / 撤銷封裝 with <p>",
-		"Wrap unwrap a"			=> "封裝 / 撤銷封裝 with <a>",
-		"Wrap unwrap b"			=> "封裝 / 撤銷封裝 with <b>",
-		"Wrap unwrap i"			=> "封裝 / 撤銷封裝 with <i>",
-		"Wrap unwrap strong"		=> "封裝 / 撤銷封裝 with <strong>",
-		"Wrap unwrap em"		=> "封裝 / 撤銷封裝 with <em>",
-		"Wrap unwrap h1..."		=> "封裝 / 撤銷封裝 with <h1> - <h3>",
+		"Wrap unwrap p"			=> "封裝 / 撤銷封裝 <p>",
+		"Wrap unwrap a"			=> "封裝 / 撤銷封裝 <a>",
+		"Wrap unwrap b"			=> "封裝 / 撤銷封裝 <b>",
+		"Wrap unwrap i"			=> "封裝 / 撤銷封裝 <i>",
+		"Wrap unwrap strong"		=> "封裝 / 撤銷封裝 <strong>",
+		"Wrap unwrap em"		=> "封裝 / 撤銷封裝 <em>",
+		"Wrap unwrap li"		=> "封装 / 撤销封装 <li>",
+		"Wrap unwrap h1..."		=> "封裝 / 撤銷封裝 <h1> - <h3>",
 		"End line with..."		=> "換行 <br>",
 		"Close tab"			=> "關閉選項卡",
 		"Select file folder"		=> "選擇文件 / 文件夾",
@@ -240,6 +241,34 @@ $text = array(
 		"Cancel tasks"			=> "取消任务"
 	),
 
+	"ice-coder" =>
+	array(
+		"No text selected..."		=> "搜索中沒有選中的文件",
+		"Creating Folder"		=> "正在創建文件夾",
+		"Sorry you can..."		=> "抱歉, 衹能同時打開100個文件!",
+		"Opening File"			=> "正在打開文件",
+		"Enter relative file..."	=> "輸入本地相對路徑 (前綴 /) 或遠程 URL",
+		"Getting"			=> "正在獲取",
+		"Please enter the..."		=> "請輸入新的名稱爲",
+		"Renaming to"			=> "正在重命名",
+		"Moving to"			=> "正在移動到",
+		"Deleting File"			=> "正在刪除文件",
+		"Pasting File"			=> "正在粘貼文件",
+		"Sorry cannot paste..."		=> "抱歉, 無法粘貼到根路徑",
+		"Nothing to paste..."		=> "粘貼失敗, 請先複製一個文件 / 文件夾!",
+		"Replacing text in"		=> "正在替換文本",
+		"Cancelled tasks"		=> "取消任務",
+		"Open previous files"		=> "打開以前的文件?",
+		"Please enter your..."		=> "請輸入您的 GitHub token (允許使用個人令牌或客戶端令牌). 可以查看 Github Auth Token 的幫助 > 更多信息在 幫助 > 設置窗口",
+		"This will compare..."		=> "將比較和顯示您的本地目錄和 GitHub repo 之間的差異. 確定嗎?",
+		"Please note for..."		=> "請注意: 需要更新才能工作, 您需要爲所有 ICEcoder 文件和文件夾設置寫如何刪除權限. 如果您需要恢復 ICEcoder 到這個版本, 您可以在 /tmp 目錄找到它們. 點擊 OK 繼續使用自動升級或點擊 cancel 訪問 ICEcoder 官方網站, 您也可以到 GitHub 的項目首頁下載 zip 來手動進行更新.",
+		"You can start..."		=> "您可以在 幫助 > 設置中啓動錯誤報告",
+		"Error cannot find..."		=> "錯誤: 無法找到和進入錯誤日志文件路徑",
+		"No new errors..."		=> "沒有新的錯誤被找到",
+		"You have made..."		=> "您已做的更改未保存。您確定要關閉它而不保存嗎?",
+		"Close all tabs"		=> "是否關閉所有選項卡?"
+	),
+
 	"login" =>
 	array(
 		"set password"			=> "設置密碼",
@@ -267,6 +296,130 @@ $text = array(
 		"selected"			=> "選擇",
 		"found in"			=> "查詢結果在",
 		"Replaced"			=> "已替換"
+	),
+
+	"plugins-manager" =>
+	array(
+		"ICEcoder needs to..."		=> "ICEcoder 需要重新加載, 這個插件才可以使用。現在刷新嗎?",
+		"saving plugins"		=> "正在保存插件...",
+		"Cannot update config..."	=> "不能更新配置文件. 請爲",
+		"and try again"			=> "設置寫入權限并刷新重試",
+		"couldnt delete dir"		=> "不能刪除目錄",
+		"couldnt delete file"		=> "不能刪除文件",
+		"plugins"			=> "插件",
+		"Guide to writing..."		=> "編寫插件指南",
+		"Manage Installed"		=> "管理已安裝",
+		"URL"				=> "URL",
+		"Target"			=> "目標",
+		"Timer"				=> "定時器",
+		"Update"			=> "更新",
+		"Install"			=> "安裝",
+		"Uninstall"			=> "卸載",
+		"Reload after install..."	=> "安裝后需要刷新"
+	),
+
+	"properties" =>
+	array(
+		"properties"			=> "屬性",
+		"Size"				=> "尺寸",
+		"Modified"			=> "修改",
+		"Last access"			=> "最近訪問",
+		"Type"				=> "類型",
+		"Readable Writeable"		=> "可讀 / 可寫",
+		"Relative path"			=> "相對路徑",
+		"Absolute path"			=> "絕對路徑",
+		"Contains"			=> "包含",
+		"Permissions"			=> "權限",
+		"Owner"				=> "所有者",
+		"Group"				=> "組",
+		"Public"			=> "公衆",
+		"Read"				=> "讀取",
+		"Write"				=> "寫入",
+		"Execute"			=> "執行",
+		"Change to"			=> "更改爲",
+		"update"			=> "更新"
+	),
+
+	"settings-common" =>
+	array(
+		"Your document does..."		=> "你的文檔不是 UTF-8 編碼, 它將被轉換"
+	),
+
+	"settings-save-current-files" =>
+	array(
+		"Cannot update config..."	=> "不能更新配置文件. 請爲",
+		"and try again"			=> "增加寫入權限并再次嘗試"
+	),
+
+	"settings-screen" =>
+	array(
+		"settings"			=> "設置",
+		"version"			=> "版本",
+		"website"			=> "網站",
+		"git"				=> "git",
+		"codemirror dir"		=> "codemirror 目錄",
+		"codemirror version"		=> "codemirror 版本",
+		"file manager root"		=> "文件管理器的根目錄 ROOT",
+		"Free to use..."		=> "您可以免費使用它, 無論商業與否, 衹需讓我知道任何很酷的或有定製的:)同樣我們無任何責任和任何擔保, 使用所有的責任都是你的. 很多個人和公司爲 ICEcoder 作出過貢獻, 在此篇幅有限無法一一列舉, 請訪問貢獻者詳細列表",
+		"functionality"			=> "功能",
+		"check for updates..."		=> "啓動時檢查更新",
+		"auto open last..."		=> "啓動時自動載入最后打開的文件",
+		"when finding in..."		=> "在查找文件時, 排除",
+		"assisting"			=> "輔助",
+		"code assist"			=> "代碼輔助",
+		"visible tabs"			=> "縮進綫可見",
+		"locked nav"			=> "鎖定導航",
+		"tag wrapper command"		=> "標簽封裝命令",
+		"auto-complete on"		=> "打開自動完成",
+		"security"			=> "安全",
+		"new password"			=> "新密碼",
+		"8 chars min"			=> "至少8個字符",
+		"confirm password"		=> "確認密碼",
+		"banned files/folders"		=> "禁止文件 / 文件夾",
+		"banned paths"			=> "禁止路徑",
+		"ip addresses"			=> "ip 地址",
+		"Slash prefixed comma..."	=> "斜綫前綴, 以半角逗號分隔",
+		"Comma delimited"		=> "以半角逗號分隔",
+		"style"				=> "樣式",
+		"theme"				=> "主題",
+		"line wrapping"			=> "換行",
+		"indent type"			=> "縮進類型",
+		"indent size"			=> "縮進大小",
+		"font size"			=> "字體大小",
+		"layout"			=> "佈局",
+		"plugin panel aligned"		=> "插件版對齊",
+		"file manager"			=> "文件管理器",
+		"root"				=> "root",
+		"Slash prefixed"		=> "斜綫前綴",
+		"bug reporting"			=> "報告錯誤",
+		"check in files"		=> "檢查文件",
+		"every"				=> "任何",
+		"secs getting last"		=> "秒, 最後得到",
+		"lines"				=> "行",
+		"multi-user"			=> "多用戶",
+		"Make sure you..."		=> "確保你沒有把自己鎖了",
+		"Registration"			=> "啓用注冊",
+		"auth token"			=> "auth token",
+		"Required to get..."		=> "如需要得到差異列表, 提交您 GitHub 上托管的 repo 等. 如果你還沒有一個, 你可以使用:".PHP_EOL.PHP_EOL.
+							"- 個人令牌訪問 (https://help.github.com/articles/creating-an-access-token-for-command-line-use), 或".PHP_EOL.
+							"- 完整的客戶端/機密雙令牌 (http://developer.github.com/v3/oauth).".PHP_EOL.PHP_EOL.
+							"我們不建議您在此處設置令牌, 更安全的方式是當 ICEcoder 要求輸入時將其隻保存在會話中.".PHP_EOL.PHP_EOL.
+							"然而, 如果你在一個信賴和安全的環境下工作, 把它設置在這裏是更有效的.",
+		"Sorry cannot commit..."	=> "抱歉, 在演示模式下不能提交設置",
+		"update"			=> "更新"
+	),
+
+	"settings-update" =>
+	array(
+		"Cannot update config..."	=> "不能更新配置文件. 請爲",
+		"and try again"			=> " 增加寫入權限并重新嘗試",
+		"and press refresh"		=> " 增加寫入權限并重新嘗試"
+	),
+
+	"updater" =>
+	array(
+		"Update appears to..."		=> "更新似乎是成功的"
 	)
+
 );
 ?>
\ No newline at end of file