Index: /trunk/htdocs/cacher/lang/zh-traditional.php
===================================================================
--- /trunk/htdocs/cacher/lang/zh-traditional.php	(revision 1102)
+++ /trunk/htdocs/cacher/lang/zh-traditional.php	(revision 1103)
@@ -2,128 +2,128 @@
 // auto generated, do not modify
 $strings += array(
-		'Editing Variable %s'
-		=> '正在编辑变量 %s',
-		'Set %s in config to enable'
-		=> '請在配置文件中設置 %s 啟用本功能',
-		'Total'
-		=> '总共',
-		'Summary'
-		=> '簡要訊息',
-		'List PHP'
-		=> '列出PHP',
-		'List Var Data'
-		=> '列變數資料',
-		'php Cached'
-		=> '快取的 PHP 指令',
-		'var Cached'
-		=> '快取的變數',
-		'php Deleted'
-		=> '待刪 PHP 指令',
-		'var Deleted'
-		=> '待刪變數',
-		'entry.id'
-		=> 'Id|',
-		'entry.remove'
-		=> '移除|',
-		'entry.name'
-		=> '項目名稱/檔案名稱|項目名稱或者檔案名稱',
-		'entry.hits'
-		=> '命中|該項目被命中的次數 (從共享記憶體區載入)',
-		'entry.size'
-		=> '大小|項目在共享記憶體裡佔用位元數',
-		'entry.refcount'
-		=> '引用數|項目依然被其他程序佔用的引用次數',
-		'entry.phprefcount'
-		=> '共享|與本項目相同 PHP 內容的个數',
-		'entry.class_cnt'
-		=> '类|类个数',
-		'entry.function_cnt'
-		=> '函数|函数个数',
-		'entry.file_size'
-		=> '源大小|原始檔案大小',
-		'entry.file_mtime'
-		=> '修改|原始檔案最後修改時間',
-		'entry.file_device'
-		=> 'dev|原始檔案所在設備ID',
-		'entry.file_inode'
-		=> 'ino|原始檔案的inode',
-		'entry.hash'
-		=> 'Hash|Hash',
-		'entry.atime'
-		=> '存取|最後存取該項目的時間',
-		'entry.ctime'
-		=> '建立|該項目被建立於共享內的時間',
-		'entry.delete'
-		=> '移除|該項目被移除於共享內的時間',
-		'Remove Selected'
-		=> '移除所选',
-		'Module Info'
-		=> '組元訊息',
-		'Caches'
-		=> '快取',
-		'cache.cache'
-		=> '快取|',
-		'cache.slots'
-		=> '槽|Hash 槽個數，對應 php.ini 裡的設置',
-		'cache.size'
-		=> '大小|共享記憶體區大小，單位：位元',
-		'cache.avail'
-		=> '剩餘|可用記憶體，對應共享記憶體區的剩餘記憶體位元數',
-		'cache.blocksgraph'
-		=> '百分比图|條狀顯示可用記憶體的比例',
-		'cache.operations'
-		=> '操作按鈕|點擊按鈕清除對應共享記憶體區的資料',
-		'cache.status'
-		=> '狀態|狀態標記. 當共享內存區正在編譯 PHP 腳本時標記為 \"編譯中\". 當共享內存區暫停使用時標記為 \"禁用\"',
-		'cache.hits'
-		=> '命中|共享記憶體命中次數，命中=從該共享記憶體載入 PHP 或者變數',
-		'cache.hits_graph'
-		=> '24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数',
-		'cache.hits_avg_h'
-		=> '命中/H|每小时命中次数. 只统计最后 24 小时',
-		'cache.hits_avg_s'
-		=> '命中/S|每秒命中次数. 只统计最后 5 秒',
-		'cache.updates'
-		=> '更新|共享記憶更新過次數',
-		'cache.skips'
-		=> '跳過|跳過更新次數，跳過=XCache 自動判斷阻塞的共享記憶體區自動跳過阻塞等待，直接使用非共享記憶體方式繼續處理請求',
-		'cache.ooms'
-		=> '記憶體不足|記憶體不足次數，顯示需要儲存新資料但是共享記憶體區記憶體不足的次數. 如果出現太頻繁請考慮加大配置中的 xcache.size 或者 xcache.var_size',
-		'cache.errors'
-		=> '错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 說明',
-		'cache.readonly_protected'
-		=> 'Protected|顯示該 Cache 是否支援並啟用 readonly_protection. 参考 說明',
-		'cache.cached'
-		=> '快取|共享記憶體於該共享記憶體區的項目個數',
-		'cache.deleted'
-		=> '待刪|共享記憶體區內將要刪除的項目 (已經刪除但是還被某些程序佔用)',
-		'cache.gc_timer'
-		=> 'GC|垃圾回收的倒數計時',
-		'Clear'
-		=> '清除',
-		'Disabled'
-		=> '禁用',
-		'Disable'
-		=> '禁用',
-		'Enable'
-		=> '啟用',
-		'Compiling'
-		=> '編譯中',
-		'Normal'
-		=> '正常',
-		'Sure?'
-		=> '確認?',
-		'Legends:'
-		=> '图例:',
-		'% Free'
-		=> '% 剩余',
-		'% Used'
-		=> '% 已用',
-		'Free Blocks'
-		=> '未用块',
-		'Used Blocks'
-		=> '已用块',
-		'Hits'
-		=> '命中',
+		"Editing Variable %s"
+		=> "正在编辑变量 %s",
+		"Set %s in config to enable"
+		=> "請在配置文件中設置 %s 啟用本功能",
+		"Total"
+		=> "总共",
+		"Summary"
+		=> "簡要訊息",
+		"List PHP"
+		=> "列出PHP",
+		"List Var Data"
+		=> "列變數資料",
+		"php Cached"
+		=> "快取的 PHP 指令",
+		"var Cached"
+		=> "快取的變數",
+		"php Deleted"
+		=> "待刪 PHP 指令",
+		"var Deleted"
+		=> "待刪變數",
+		"entry.id"
+		=> "Id|",
+		"entry.remove"
+		=> "移除|",
+		"entry.name"
+		=> "項目名稱/檔案名稱|項目名稱或者檔案名稱",
+		"entry.hits"
+		=> "命中|該項目被命中的次數 (從共享記憶體區載入)",
+		"entry.size"
+		=> "大小|項目在共享記憶體裡佔用位元數",
+		"entry.refcount"
+		=> "引用數|項目依然被其他程序佔用的引用次數",
+		"entry.phprefcount"
+		=> "共享|與本項目相同 PHP 內容的个數",
+		"entry.class_cnt"
+		=> "类|类个数",
+		"entry.function_cnt"
+		=> "函数|函数个数",
+		"entry.file_size"
+		=> "源大小|原始檔案大小",
+		"entry.file_mtime"
+		=> "修改|原始檔案最後修改時間",
+		"entry.file_device"
+		=> "dev|原始檔案所在設備ID",
+		"entry.file_inode"
+		=> "ino|原始檔案的inode",
+		"entry.hash"
+		=> "Hash|Hash",
+		"entry.atime"
+		=> "存取|最後存取該項目的時間",
+		"entry.ctime"
+		=> "建立|該項目被建立於共享內的時間",
+		"entry.delete"
+		=> "移除|該項目被移除於共享內的時間",
+		"Remove Selected"
+		=> "移除所选",
+		"Module Info"
+		=> "組元訊息",
+		"Caches"
+		=> "快取",
+		"cache.cache"
+		=> "快取|",
+		"cache.slots"
+		=> "槽|Hash 槽個數，對應 php.ini 裡的設置",
+		"cache.size"
+		=> "大小|共享記憶體區大小，單位：位元",
+		"cache.avail"
+		=> "剩餘|可用記憶體，對應共享記憶體區的剩餘記憶體位元數",
+		"cache.blocksgraph"
+		=> "百分比图|條狀顯示可用記憶體的比例",
+		"cache.operations"
+		=> "操作按鈕|點擊按鈕清除對應共享記憶體區的資料",
+		"cache.status"
+		=> "狀態|狀態標記. 當共享內存區正在編譯 PHP 腳本時標記為 \"編譯中\". 當共享內存區暫停使用時標記為 \"禁用\"",
+		"cache.hits"
+		=> "命中|共享記憶體命中次數，命中=從該共享記憶體載入 PHP 或者變數",
+		"cache.hits_graph"
+		=> "24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数",
+		"cache.hits_avg_h"
+		=> "命中/H|每小时命中次数. 只统计最后 24 小时",
+		"cache.hits_avg_s"
+		=> "命中/S|每秒命中次数. 只统计最后 5 秒",
+		"cache.updates"
+		=> "更新|共享記憶更新過次數",
+		"cache.skips"
+		=> "跳過|跳過更新次數，跳過=XCache 自動判斷阻塞的共享記憶體區自動跳過阻塞等待，直接使用非共享記憶體方式繼續處理請求",
+		"cache.ooms"
+		=> "記憶體不足|記憶體不足次數，顯示需要儲存新資料但是共享記憶體區記憶體不足的次數. 如果出現太頻繁請考慮加大配置中的 xcache.size 或者 xcache.var_size",
+		"cache.errors"
+		=> "错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 說明",
+		"cache.readonly_protected"
+		=> "Protected|顯示該 Cache 是否支援並啟用 readonly_protection. 参考 說明",
+		"cache.cached"
+		=> "快取|共享記憶體於該共享記憶體區的項目個數",
+		"cache.deleted"
+		=> "待刪|共享記憶體區內將要刪除的項目 (已經刪除但是還被某些程序佔用)",
+		"cache.gc_timer"
+		=> "GC|垃圾回收的倒數計時",
+		"Clear"
+		=> "清除",
+		"Disabled"
+		=> "禁用",
+		"Disable"
+		=> "禁用",
+		"Enable"
+		=> "啟用",
+		"Compiling"
+		=> "編譯中",
+		"Normal"
+		=> "正常",
+		"Sure?"
+		=> "確認?",
+		"Legends:"
+		=> "图例:",
+		"% Free"
+		=> "% 剩余",
+		"% Used"
+		=> "% 已用",
+		"Free Blocks"
+		=> "未用块",
+		"Used Blocks"
+		=> "已用块",
+		"Hits"
+		=> "命中",
 		);
 
Index: /trunk/htdocs/cacher/lang/en.php
===================================================================
--- /trunk/htdocs/cacher/lang/en.php	(revision 1102)
+++ /trunk/htdocs/cacher/lang/en.php	(revision 1103)
@@ -2,86 +2,86 @@
 // auto generated, do not modify
 $strings += array(
-		'php Cached'
-		=> 'PHP Cached',
-		'var Cached'
-		=> 'Variable Cached',
-		'php Deleted'
-		=> 'PHP Deleted',
-		'var Deleted'
-		=> 'Variable Deleted',
-		'entry.id'
-		=> 'Id|',
-		'entry.remove'
-		=> 'Remove|',
-		'entry.name'
-		=> 'Entry name|The entry name or filename',
-		'entry.hits'
-		=> 'Hits|Hit times of this entry (loaded from this cache)',
-		'entry.size'
-		=> 'Size|Size in bytes of this entry in the cache',
-		'entry.refcount'
-		=> 'Refs|Reference count of this entry is holded by a php request',
-		'entry.phprefcount'
-		=> 'Shares|Count of entry sharing this php data',
-		'entry.class_cnt'
-		=> 'Cls.|Count of classes',
-		'entry.function_cnt'
-		=> 'Funcs|Count of functions',
-		'entry.file_size'
-		=> 'Src Size|Size of the source file',
-		'entry.file_mtime'
-		=> 'Modified|Last modified time of the source file',
-		'entry.file_device'
-		=> 'dev|device number of the source file',
-		'entry.file_inode'
-		=> 'ino|inode number of the source file',
-		'entry.hash'
-		=> 'Hash|Hash value of this entry',
-		'entry.atime'
-		=> 'Access|Last time when this entry is accessed',
-		'entry.ctime'
-		=> 'Create|The time when this entry is stored',
-		'entry.delete'
-		=> 'Delete|The time when this entry is deleted',
-		'Caches'
-		=> 'Caches',
-		'cache.cache'
-		=> 'Cache|',
-		'cache.slots'
-		=> 'Slots|Number of hash slots. the setting from your php.ini',
-		'cache.size'
-		=> 'Size|Cache Size, Size of the cache (or cache chunk), in bytes',
-		'cache.avail'
-		=> 'Avail|Available Memory, free memory in bytes of this cache',
-		'cache.blocksgraph'
-		=> 'Percent Graph|Shows how much memory available in percent, and memory blocks status in graph',
-		'cache.operations'
-		=> 'Operations|Press the clear button to clean this cache',
-		'cache.status'
-		=> 'Status|Compiling flag, \"Compiling\" if the cache is busy compiling php script. \"Disabled\" if cache is disabled',
-		'cache.hits'
-		=> 'Hits|Cache Hits, hit=a var/php is loaded from this cache',
-		'cache.hits_graph'
-		=> 'Hits*24H|Hits graph of last 24 hours',
-		'cache.hits_avg_h'
-		=> 'Hits/H|Average Hits per Hour. Only last 24 hours is logged',
-		'cache.hits_avg_s'
-		=> 'Hits/S|Average Hits per Second. Only last 5 seconds is logged',
-		'cache.updates'
-		=> 'Updates|Cache Updates',
-		'cache.skips'
-		=> 'Skips|Skips. Skip=updates are needed but skipped for some reason. e.g.: other process/thread is busy compiling on this cache',
-		'cache.ooms'
-		=> 'OOMs|Out Of Memory, how many times a new item should be stored but there isn't enough memory in the cache, think of increasing the xcache.size or xcache.var_size',
-		'cache.errors'
-		=> 'Errs|Compiler errors, how many times your script is compiled but failed. You should really check what is happening if you see this value increase. (See Help for more information)',
-		'cache.readonly_protected'
-		=> 'Protected|Whether readonly_protection is available and enable on this cache (See help for more information)',
-		'cache.cached'
-		=> 'Cached|Number of entries stored in this cache',
-		'cache.deleted'
-		=> 'Deleted|Number of entries is pending in delete list (expired but referenced)',
-		'cache.gc_timer'
-		=> 'GC|Seconds count down of Garbage Collection',
+		"php Cached"
+		=> "PHP Cached",
+		"var Cached"
+		=> "Variable Cached",
+		"php Deleted"
+		=> "PHP Deleted",
+		"var Deleted"
+		=> "Variable Deleted",
+		"entry.id"
+		=> "Id|",
+		"entry.remove"
+		=> "Remove|",
+		"entry.name"
+		=> "Entry name|The entry name or filename",
+		"entry.hits"
+		=> "Hits|Hit times of this entry (loaded from this cache)",
+		"entry.size"
+		=> "Size|Size in bytes of this entry in the cache",
+		"entry.refcount"
+		=> "Refs|Reference count of this entry is holded by a php request",
+		"entry.phprefcount"
+		=> "Shares|Count of entry sharing this php data",
+		"entry.class_cnt"
+		=> "Cls.|Count of classes",
+		"entry.function_cnt"
+		=> "Funcs|Count of functions",
+		"entry.file_size"
+		=> "Src Size|Size of the source file",
+		"entry.file_mtime"
+		=> "Modified|Last modified time of the source file",
+		"entry.file_device"
+		=> "dev|device number of the source file",
+		"entry.file_inode"
+		=> "ino|inode number of the source file",
+		"entry.hash"
+		=> "Hash|Hash value of this entry",
+		"entry.atime"
+		=> "Access|Last time when this entry is accessed",
+		"entry.ctime"
+		=> "Create|The time when this entry is stored",
+		"entry.delete"
+		=> "Delete|The time when this entry is deleted",
+		"Caches"
+		=> "Caches",
+		"cache.cache"
+		=> "Cache|",
+		"cache.slots"
+		=> "Slots|Number of hash slots. the setting from your php.ini",
+		"cache.size"
+		=> "Size|Cache Size, Size of the cache (or cache chunk), in bytes",
+		"cache.avail"
+		=> "Avail|Available Memory, free memory in bytes of this cache",
+		"cache.blocksgraph"
+		=> "Percent Graph|Shows how much memory available in percent, and memory blocks status in graph",
+		"cache.operations"
+		=> "Operations|Press the clear button to clean this cache",
+		"cache.status"
+		=> "Status|Compiling flag, \"Compiling\" if the cache is busy compiling php script. \"Disabled\" if cache is disabled",
+		"cache.hits"
+		=> "Hits|Cache Hits, hit=a var/php is loaded from this cache",
+		"cache.hits_graph"
+		=> "Hits*24H|Hits graph of last 24 hours",
+		"cache.hits_avg_h"
+		=> "Hits/H|Average Hits per Hour. Only last 24 hours is logged",
+		"cache.hits_avg_s"
+		=> "Hits/S|Average Hits per Second. Only last 5 seconds is logged",
+		"cache.updates"
+		=> "Updates|Cache Updates",
+		"cache.skips"
+		=> "Skips|Skips. Skip=updates are needed but skipped for some reason. e.g.: other process/thread is busy compiling on this cache",
+		"cache.ooms"
+		=> "OOMs|Out Of Memory, how many times a new item should be stored but there isn't enough memory in the cache, think of increasing the xcache.size or xcache.var_size",
+		"cache.errors"
+		=> "Errs|Compiler errors, how many times your script is compiled but failed. You should really check what is happening if you see this value increase. (See Help for more information)",
+		"cache.readonly_protected"
+		=> "Protected|Whether readonly_protection is available and enable on this cache (See help for more information)",
+		"cache.cached"
+		=> "Cached|Number of entries stored in this cache",
+		"cache.deleted"
+		=> "Deleted|Number of entries is pending in delete list (expired but referenced)",
+		"cache.gc_timer"
+		=> "GC|Seconds count down of Garbage Collection",
 		);
 
Index: /trunk/htdocs/cacher/lang/zh-simplified.php
===================================================================
--- /trunk/htdocs/cacher/lang/zh-simplified.php	(revision 1102)
+++ /trunk/htdocs/cacher/lang/zh-simplified.php	(revision 1103)
@@ -2,128 +2,128 @@
 // auto generated, do not modify
 $strings += array(
-		'Editing Variable %s'
-		=> '正在编辑变量 %s',
-		'Set %s in config to enable'
-		=> '请在配置文件中设置 %s 启用本功能',
-		'Total'
-		=> '总共',
-		'Summary'
-		=> '摘要信息',
-		'List PHP'
-		=> '列出PHP',
-		'List Var Data'
-		=> '列变量数据',
-		'php Cached'
-		=> '缓存的 PHP 脚本',
-		'var Cached'
-		=> '缓存的变量',
-		'php Deleted'
-		=> '待删 PHP 缓存',
-		'var Deleted'
-		=> '待删变量',
-		'entry.id'
-		=> 'Id|',
-		'entry.remove'
-		=> '删除|',
-		'entry.name'
-		=> '项目名/文件名|项目名或者文件名',
-		'entry.hits'
-		=> '命中|该项目被命中的次数 (从共享内存区载入)',
-		'entry.size'
-		=> '大小|项目在共享内存里占用字节数',
-		'entry.refcount'
-		=> '引用数|项目依然被其他进程占据的引用次数',
-		'entry.phprefcount'
-		=> '共享数|与本项目相同 PHP 代码的个数',
-		'entry.class_cnt'
-		=> '类|类个数',
-		'entry.function_cnt'
-		=> '函数|函数个数',
-		'entry.file_size'
-		=> '源大小|源文件大小',
-		'entry.file_mtime'
-		=> '修改|源文件最后修改时间',
-		'entry.file_device'
-		=> 'dev|源文件所在设备ID',
-		'entry.file_inode'
-		=> 'ino|源文件的 inode',
-		'entry.hash'
-		=> '哈希|该项目的哈希值',
-		'entry.atime'
-		=> '访问|最后访问该项目的时间',
-		'entry.ctime'
-		=> '创建|该项目被创建于共享内的时间',
-		'entry.delete'
-		=> '删除|该项目被决定删除的时间',
-		'Remove Selected'
-		=> '删除所选',
-		'Module Info'
-		=> '模块信息',
-		'Caches'
-		=> '缓存区',
-		'cache.cache'
-		=> '缓存|',
-		'cache.slots'
-		=> '槽|Hash 槽个数, 对应 php.ini 里的设置',
-		'cache.size'
-		=> '大小|共享内存区大小, 单位: 字节',
-		'cache.avail'
-		=> '剩余|可用内存, 对应共享内存区的剩余内存字节数',
-		'cache.blocksgraph'
-		=> '百分比图|条状显示可用内存的比例, 以及显示分配块状态',
-		'cache.operations'
-		=> '操作|点击按钮清除对应共享内存区的数据',
-		'cache.status'
-		=> '状态|状态标记. 当共享内存区正在编译 PHP 脚本时标记为 \"编译中\". 当共享内存区暂停使用时标记为 \"禁用\"',
-		'cache.hits'
-		=> '命中|共享内存命中次数, 命中=从该共享内存载入 PHP 或者变量',
-		'cache.hits_graph'
-		=> '24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数',
-		'cache.hits_avg_h'
-		=> '命中/H|每小时命中次数. 只统计最后 24 小时',
-		'cache.hits_avg_s'
-		=> '命中/S|每秒命中次数. 只统计最后 5 秒',
-		'cache.updates'
-		=> '更新|共享内存更新次数',
-		'cache.skips'
-		=> '阻塞|跳过更新次数, 跳过=XCache 自动判断阻塞的共享内存区自动跳过阻塞等待, 直接使用非共享内存方式继续处理请求',
-		'cache.ooms'
-		=> '内存不足|内存不足次数, 显示需要存储新数据但是共享内存区内存不足的次数. 如果出现太频繁请考虑加大配置中的 xcache.size 或者 xcache.var_size',
-		'cache.errors'
-		=> '错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 帮助 获取更多信息',
-		'cache.readonly_protected'
-		=> '保护|显示该 Cache 是否支持并启用 readonly_protection. 参考 帮助 获取更多信息',
-		'cache.cached'
-		=> '缓存|共享内存于该共享内存区的项目条数',
-		'cache.deleted'
-		=> '待删|共享内存区内将要删除的项目 (已经删除但是还被某些进程占用)',
-		'cache.gc_timer'
-		=> 'GC|垃圾回收的倒计时',
-		'Clear'
-		=> '清除',
-		'Disabled'
-		=> '禁用',
-		'Disable'
-		=> '禁用',
-		'Enable'
-		=> '启用',
-		'Compiling'
-		=> '编译中',
-		'Normal'
-		=> '正常',
-		'Sure?'
-		=> '确认?',
-		'Legends:'
-		=> '图例:',
-		'% Free'
-		=> '% 剩余',
-		'% Used'
-		=> '% 已用',
-		'Free Blocks'
-		=> '未用块',
-		'Used Blocks'
-		=> '已用块',
-		'Hits'
-		=> '命中',
+		"Editing Variable %s"
+		=> "正在编辑变量 %s",
+		"Set %s in config to enable"
+		=> "请在配置文件中设置 %s 启用本功能",
+		"Total"
+		=> "总共",
+		"Summary"
+		=> "摘要信息",
+		"List PHP"
+		=> "列出PHP",
+		"List Var Data"
+		=> "列变量数据",
+		"php Cached"
+		=> "缓存的 PHP 脚本",
+		"var Cached"
+		=> "缓存的变量",
+		"php Deleted"
+		=> "待删 PHP 缓存",
+		"var Deleted"
+		=> "待删变量",
+		"entry.id"
+		=> "Id|",
+		"entry.remove"
+		=> "删除|",
+		"entry.name"
+		=> "项目名/文件名|项目名或者文件名",
+		"entry.hits"
+		=> "命中|该项目被命中的次数 (从共享内存区载入)",
+		"entry.size"
+		=> "大小|项目在共享内存里占用字节数",
+		"entry.refcount"
+		=> "引用数|项目依然被其他进程占据的引用次数",
+		"entry.phprefcount"
+		=> "共享数|与本项目相同 PHP 代码的个数",
+		"entry.class_cnt"
+		=> "类|类个数",
+		"entry.function_cnt"
+		=> "函数|函数个数",
+		"entry.file_size"
+		=> "源大小|源文件大小",
+		"entry.file_mtime"
+		=> "修改|源文件最后修改时间",
+		"entry.file_device"
+		=> "dev|源文件所在设备ID",
+		"entry.file_inode"
+		=> "ino|源文件的 inode",
+		"entry.hash"
+		=> "哈希|该项目的哈希值",
+		"entry.atime"
+		=> "访问|最后访问该项目的时间",
+		"entry.ctime"
+		=> "创建|该项目被创建于共享内的时间",
+		"entry.delete"
+		=> "删除|该项目被决定删除的时间",
+		"Remove Selected"
+		=> "删除所选",
+		"Module Info"
+		=> "模块信息",
+		"Caches"
+		=> "缓存区",
+		"cache.cache"
+		=> "缓存|",
+		"cache.slots"
+		=> "槽|Hash 槽个数, 对应 php.ini 里的设置",
+		"cache.size"
+		=> "大小|共享内存区大小, 单位: 字节",
+		"cache.avail"
+		=> "剩余|可用内存, 对应共享内存区的剩余内存字节数",
+		"cache.blocksgraph"
+		=> "百分比图|条状显示可用内存的比例, 以及显示分配块状态",
+		"cache.operations"
+		=> "操作|点击按钮清除对应共享内存区的数据",
+		"cache.status"
+		=> "状态|状态标记. 当共享内存区正在编译 PHP 脚本时标记为 \"编译中\". 当共享内存区暂停使用时标记为 \"禁用\"",
+		"cache.hits"
+		=> "命中|共享内存命中次数, 命中=从该共享内存载入 PHP 或者变量",
+		"cache.hits_graph"
+		=> "24H 分布|24 小时命中分布图. 图表现是最后 24 小时的命中次数",
+		"cache.hits_avg_h"
+		=> "命中/H|每小时命中次数. 只统计最后 24 小时",
+		"cache.hits_avg_s"
+		=> "命中/S|每秒命中次数. 只统计最后 5 秒",
+		"cache.updates"
+		=> "更新|共享内存更新次数",
+		"cache.skips"
+		=> "阻塞|跳过更新次数, 跳过=XCache 自动判断阻塞的共享内存区自动跳过阻塞等待, 直接使用非共享内存方式继续处理请求",
+		"cache.ooms"
+		=> "内存不足|内存不足次数, 显示需要存储新数据但是共享内存区内存不足的次数. 如果出现太频繁请考虑加大配置中的 xcache.size 或者 xcache.var_size",
+		"cache.errors"
+		=> "错误|编译错误, 显示您的脚本被编译时出错的次数. 如果您发现这个数字不断增长, 您应该检查什么脚本产生错误. 参考 帮助 获取更多信息",
+		"cache.readonly_protected"
+		=> "保护|显示该 Cache 是否支持并启用 readonly_protection. 参考 帮助 获取更多信息",
+		"cache.cached"
+		=> "缓存|共享内存于该共享内存区的项目条数",
+		"cache.deleted"
+		=> "待删|共享内存区内将要删除的项目 (已经删除但是还被某些进程占用)",
+		"cache.gc_timer"
+		=> "GC|垃圾回收的倒计时",
+		"Clear"
+		=> "清除",
+		"Disabled"
+		=> "禁用",
+		"Disable"
+		=> "禁用",
+		"Enable"
+		=> "启用",
+		"Compiling"
+		=> "编译中",
+		"Normal"
+		=> "正常",
+		"Sure?"
+		=> "确认?",
+		"Legends:"
+		=> "图例:",
+		"% Free"
+		=> "% 剩余",
+		"% Used"
+		=> "% 已用",
+		"Free Blocks"
+		=> "未用块",
+		"Used Blocks"
+		=> "已用块",
+		"Hits"
+		=> "命中",
 		);
 
Index: /trunk/htdocs/common/lang/zh-traditional.php
===================================================================
--- /trunk/htdocs/common/lang/zh-traditional.php	(revision 1102)
+++ /trunk/htdocs/common/lang/zh-traditional.php	(revision 1103)
@@ -2,18 +2,18 @@
 // auto generated, do not modify
 $strings += array(
-		'Document'
-		=> '幫助文檔',
-		'INI Reference'
-		=> 'INI 參考',
-		'Get Support'
-		=> '獲取支持',
-		'Discusson'
-		=> '討論',
-		'Cacher'
-		=> '快取器',
-		'Coverager'
-		=> '代码覆盖查看器',
-		'Diagnosis'
-		=> '診斷',
+		"Document"
+		=> "幫助文檔",
+		"INI Reference"
+		=> "INI 參考",
+		"Get Support"
+		=> "獲取支持",
+		"Discusson"
+		=> "討論",
+		"Cacher"
+		=> "快取器",
+		"Coverager"
+		=> "代码覆盖查看器",
+		"Diagnosis"
+		=> "診斷",
 		);
 
Index: /trunk/htdocs/common/lang/zh-simplified.php
===================================================================
--- /trunk/htdocs/common/lang/zh-simplified.php	(revision 1102)
+++ /trunk/htdocs/common/lang/zh-simplified.php	(revision 1103)
@@ -2,18 +2,18 @@
 // auto generated, do not modify
 $strings += array(
-		'Document'
-		=> '帮助文档',
-		'INI Reference'
-		=> 'INI 参考',
-		'Get Support'
-		=> '获取支持',
-		'Discusson'
-		=> '讨论',
-		'Cacher'
-		=> '缓存器',
-		'Coverager'
-		=> '代码覆盖查看器',
-		'Diagnosis'
-		=> '诊断',
+		"Document"
+		=> "帮助文档",
+		"INI Reference"
+		=> "INI 参考",
+		"Get Support"
+		=> "获取支持",
+		"Discusson"
+		=> "讨论",
+		"Cacher"
+		=> "缓存器",
+		"Coverager"
+		=> "代码覆盖查看器",
+		"Diagnosis"
+		=> "诊断",
 		);
 
Index: /trunk/htdocs/coverager/lang/zh-simplified.php
===================================================================
--- /trunk/htdocs/coverager/lang/zh-simplified.php	(revision 1102)
+++ /trunk/htdocs/coverager/lang/zh-simplified.php	(revision 1103)
@@ -2,18 +2,18 @@
 // auto generated, do not modify
 $strings += array(
-		'Directory'
-		=> '目录',
-		'Percent'
-		=> '覆盖率',
-		'Hits'
-		=> '命中',
-		'Lines'
-		=> '行数',
-		'TODO'
-		=> '闲置文件',
-		'File'
-		=> '文件',
-		'root'
-		=> '开始',
+		"Directory"
+		=> "目录",
+		"Percent"
+		=> "覆盖率",
+		"Hits"
+		=> "命中",
+		"Lines"
+		=> "行数",
+		"TODO"
+		=> "闲置文件",
+		"File"
+		=> "文件",
+		"root"
+		=> "开始",
 		);
 
Index: /trunk/htdocs/diagnosis/index.php
===================================================================
--- /trunk/htdocs/diagnosis/index.php	(revision 1099)
+++ /trunk/htdocs/diagnosis/index.php	(revision 1103)
@@ -85,11 +85,11 @@
 	}
 	else {
-		echo _T("Cannot detect ini location");
-	}
-	echo _T(" (See above)");
-	result("error", _T('Not loaded'), ob_get_clean());
-}
-else {
-	result("info", _T('Loaded'));
+		echo _T("Cannot detect php.ini location");
+	}
+	echo " ", _T("(See above)");
+	result(N_("error"), _T('Not loaded'), ob_get_clean());
+}
+else {
+	result(N_("info"), _T('Loaded'));
 }
 // }}}
@@ -124,34 +124,31 @@
 checking(_T("Enabling PHP Cacher")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if (!ini_get("xcache.size")) {
-	result(
-		"error"
-		, _T("Not enabled: Website is not accelerated by XCache")
-		, _T("Set xcache.size to non-zero, set xcache.cacher = On")
+	result(N_("error")
+		, _T("Not enabled")
+		, _T("Your PHP pages is not accelerated by XCache. Set xcache.size to non-zero, set xcache.cacher = On")
 		);
 }
 else if (!$phpCached) {
-	result(
-		"error"
-		, _T("No php script cached: Website is not accelerated by XCache")
-		, _T("Set xcache.cacher = On")
-		);
-}
-else {
-	result("info", _T('Enabled'));
+	result(N_("error")
+		, _T("No php script cached")
+		, _T("Your PHP pages is not accelerated by XCache. Set xcache.cacher = On")
+		);
+}
+else {
+	result(N_("info"), _T('Enabled'));
 }
 // }}}
 checking(_T("PHP Compile Time Error")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if (!$phpCacheCount) {
-	result("skipped", "XCache PHP cacher not enabled");
+	result(N_("skipped"), "XCache PHP cacher not enabled");
 }
 else if ($errors) {
-	result(
-		"warning"
+	result(N_("warning")
 		, _T("Error happened when compiling at least one of your PHP code")
 		, _T("This usually means there is syntax error in your PHP code. Enable PHP error_log to see what parser error is it, fix your code")
@@ -159,17 +156,16 @@
 }
 else {
-	result("info", _T('No error happened'));
+	result(N_("info"), _T('No error happened'));
 }
 // }}}
 checking(_T("Busy Compiling")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if (!$phpCacheCount) {
-	result("skipped", "XCache PHP cacher not enabled");
+	result(N_("skipped"), "XCache PHP cacher not enabled");
 }
 else if ($compiling) {
-	result(
-		"warning"
+	result(N_("warning")
 		, _T("Cache marked as busy for compiling")
 		, _T("It's ok if this status don't stay for long. Otherwise, it could be a sign of PHP crash/coredump, report to XCache devs")
@@ -177,32 +173,30 @@
 }
 else {
-	result("info", _T('Idle'));
+	result(N_("info"), _T('Idle'));
 }
 // }}}
 checking(_T("Enabling VAR Cacher")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if (!ini_get("xcache.var_size")) {
-	result(
-		"error"
-		, _T("Not enabled: code that use xcache var cacher fall back to other backend")
-		, _T("Set xcache.var_size to non-zero")
-		);
-}
-else {
-	result("info", _T('Enabled'));
+	result(N_("error")
+		, _T("Not enabled")
+		, _T("PHP code that use XCache caching backend have to use other caching backend instead. Set xcache.var_size to non-zero")
+		);
+}
+else {
+	result(N_("info"), _T('Enabled'));
 
 	checking(_T("Using VAR Cacher")); // {{{
-	if ($varCached) {
-		result(
-			"warning"
+	if (!$varCached) {
+		result(N_("warning")
 			, _T("No variable data cached")
 			, _T("Var Cacher won't work simply by enabling it."
-				. " PHP code must call XCache APIs like xcache_set() to use it as cache backend. 3rd party web apps may come with XCache support, config it to use XCache as cachign backend")
+				. " PHP code must call XCache APIs like xcache_set() to use it as cache backend. 3rd party web apps may come with XCache support, config it to use XCache as caching backend")
 			);
 	}
 	else {
-		result("info", _T('Cache in use'));
+		result(N_("info"), _T('Cache in use'));
 	}
 	// }}}
@@ -211,9 +205,8 @@
 checking(_T("Cache Size")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if ($ooms) {
-	result(
-		"warning"
+	result(N_("warning")
 		, _T("Out of memory happened when trying to write to cache")
 		, _T("Increase xcache.size and/or xcache.var_size")
@@ -221,8 +214,8 @@
 }
 else {
-	result("info", _T('Enough'));
-}
-// }}}
-checking(_T("Slots")); // {{{
+	result(N_("info"), _T('Enough'));
+}
+// }}}
+checking(_T("Hash Slots")); // {{{
 $slotsTooBig = null;
 $slotsTooSmall = null;
@@ -239,6 +232,5 @@
 if (isset($slotsTooBig)) {
 	$prefix = $slotsTooBig == XC_TYPE_PHP ? '' : 'var_';
-	result(
-		"warning"
+	result(N_("warning")
 		, _T("Slots value too big")
 		, sprintf(_T("A very small value is set to %s value and leave %s value is too big.\n"
@@ -248,6 +240,5 @@
 else if (isset($slotsTooSmall)) {
 	$prefix = $slotsTooSmall == XC_TYPE_PHP ? '' : 'var_';
-	result(
-		"warning"
+	result(N_("warning")
 		, _T("Slots value too small")
 		, sprintf(_T("So many item are cached. Increase %s to a more proper value"), "xcache.{$prefix}slots")
@@ -255,22 +246,21 @@
 }
 else {
-	result("info", _T('Looks good'));
+	result(N_("info"), _T('Looks good'));
 }
 // }}}
 checking(_T("Cache Status")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if ($disabled) {
-	result(
-		"warning"
+	result(N_("warning")
 		, _T("At least one of the caches is disabled. ")
-			. (ini_get("xcache.crash_on_coredump") ? _T("It was disabled by PHP crash/coredump handler or You disabled it manually") : _T('You disabled it manually'))
 		, _T("Enable the cache.")
+			. (ini_get("xcache.crash_on_coredump") ? " " . _T("It was disabled by PHP crash/coredump handler or you disabled it manually.") : _T('You disabled it manually.'))
 			. (ini_get("xcache.crash_on_coredump") ? " " . _T("If it was caused by PHP crash/coredump, report to XCache devs") : "")
 		);
 }
 else {
-	result("info", _T('Idle'));
+	result(N_("info"), _T('Idle'));
 }
 // }}}
@@ -278,10 +268,10 @@
 checking(_T("Coredump Directory")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if (!ini_get("xcache.coredump_directory")) {
-	result("info"
+	result(N_("info")
 			, _T("Not enabled")
-			, _T("Enable coredump to know your PHP crash. It can also be enabled in fpm other than in XCache")
+			, _T("Enable coredump to save debugging information in case when PHP crash. It can also be enabled in other module like php-fpm beside XCache")
 			);
 }
@@ -293,11 +283,11 @@
 	$coreFiles = glob($coreDir . "core*");
 	if ($coreFiles) {
-		result("error"
+		result(N_("error")
 				, _T("Core files found:\n") . implode("\n", $coreFiles)
-				, _T("Disable XCache PHP Cacher (xcache.size=0), remove the core file(s). If core file appears again, report call stack backtrace in the core to XCache devs")
+				, _T("Disable XCache PHP Cacher (set xcache.size=0), remove the core file(s), then restart PHP. If core file appears again, report call stack backtrace in the core to XCache devs")
 				);
 	}
 	else {
-		result("info"
+		result(N_("info")
 				, _T("Enabled")
 				, sprintf(_T("You can see core files if PHP crash in %s if PHP crash"), ini_get("xcache.coredump_directory"))
@@ -308,9 +298,8 @@
 checking(_T("Readonly Protection")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if (ini_get("xcache.readonly_protection") && !$readonlyProtection) {
-	result(
-		"error"
+	result(N_("error")
 		, _T("Set to enabled but not available")
 		, _T("Use xcache.mmap_path other than /dev/zero")
@@ -318,6 +307,5 @@
 }
 else {
-	result(
-		"info"
+	result(N_("info")
 		, $readonlyProtection ? _T("Enabled") : _T("Disabled")
 		, _T("Enable readonly_protection == --performance & ++stability. "
@@ -328,5 +316,5 @@
 checking(_T("XCache modules")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else {
@@ -334,14 +322,13 @@
 	$unexpectedModules = array_intersect($xcacheModules, array("coverager", "disassembler"));
 	if ($unexpectedModules) {
-		result(
-			"warning"
+		result(N_("warning")
 			, implode("\n", $unexpectedModules)
-			, _T("Acceptable. Module(s) listed above are built into XCache but not for production server\n"
+			, _T("Acceptable. Module(s) listed are built into XCache but not for production server.\n"
 				. "Leave it as is if you're feeling good.\n"
-				. "Re-configure XCache with the above module(s) disabled if you're strict with server security.")
+				. "Re-configure XCache with the module(s) disabled if you're strict with server security.")
 			);
 	}
 	else {
-		result("info", _T('Idle'));
+		result(N_("info"), _T('Idle'));
 	}
 }
@@ -349,9 +336,8 @@
 checking(_T("XCache test setting")); // {{{
 if (!$xcacheLoaded) {
-	result("skipped", "XCache not loaded");
+	result(N_("skipped"), "XCache not loaded");
 }
 else if ((int) ini_get('xcache.test') == 1) {
-	result(
-		"warning"
+	result(N_("warning")
 		, _T("Enabled")
 		, _T("xcache.test is for testing only, not for server. set it to off")
@@ -359,5 +345,5 @@
 }
 else {
-	result("info", _T('Disabled'));
+	result(N_("info"), _T('Disabled'));
 }
 // }}}
@@ -380,10 +366,10 @@
 }
 if ($unstablePhpVersionReason) {
-	result("error"
+	result(N_("error")
 			, _T("The version of PHP you're using is known to be unstable: ") . $unstablePhpVersionReason
 			, _T("Upgrade to new version of PHP"));
 }
 else {
-	result("info", _T("Looks good"));
+	result(N_("info"), _T("Looks good"));
 }
 // }}}
@@ -391,10 +377,12 @@
 $loadedZendExtensions = get_loaded_extensions(true);
 if (array_search("Zend Optimizer", $loadedZendExtensions) !== false) {
-	result(
-		"warning"
+	result(N_("info")
 		, _T("Zend Optimizer loaded")
 		, _T("Optimizer feature of 'Zend Optimizer' is disabled by XCache due to compatibility reason; the Loader of it is still available, encoded files are still supported")
 		);
 }
+else {
+	result(N_("info"), _T("Looks good"));
+}
 // }}}
 
Index: /trunk/htdocs/diagnosis/lang/zh-simplified.php
===================================================================
--- /trunk/htdocs/diagnosis/lang/zh-simplified.php	(revision 1102)
+++ /trunk/htdocs/diagnosis/lang/zh-simplified.php	(revision 1103)
@@ -2,4 +2,148 @@
 // auto generated, do not modify
 $strings += array(
+		"Diagnosis Result"
+		=> "诊断结果",
+		"Item"
+		=> "项目",
+		"Level"
+		=> "级别",
+		"Result"
+		=> "结果",
+		"Explanation/Suggestion"
+		=> "解释/建议",
+		"XCache extension"
+		=> "XCache extension",
+		"Add extension=xcache.so (or xcache.dll) in %s"
+		=> "在 %s 增加 extension=xcache.so (或 xcache.dll)",
+		"Please put a php.ini in %s and add extension=xcache.so (or xcache.dll) in it"
+		=> "请在 %s 里放个 php.ini 并且在文件内写入 extension=xcache.so (或 xcache.dll)",
+		"Cannot detect php.ini location"
+		=> "无法检测 php.ini 位置",
+		"(See above)"
+		=> "(参见上面)",
+		"Not loaded"
+		=> "未载入",
+		"error"
+		=> "错误",
+		"Loaded"
+		=> "已载入",
+		"info"
+		=> "信息",
+		"Enabling PHP Cacher"
+		=> "启用 PHP 缓存器",
+		"skipped"
+		=> "跳过",
+		"Not enabled"
+		=> "尚未启用",
+		"Your PHP pages is not accelerated by XCache. Set xcache.size to non-zero, set xcache.cacher = On"
+		=> "XCache 并未对您的 PHP 网页起到加速作用. 设置 xcache.size 为非 0, 设置 xcache.cacher = On",
+		"No php script cached"
+		=> "未缓存任何 PHP 脚本",
+		"Your PHP pages is not accelerated by XCache. Set xcache.cacher = On"
+		=> "XCache 并未对您的 PHP 网页起到加速作用. 设置 xcache.cacher = On",
+		"Enabled"
+		=> "已启用",
+		"PHP Compile Time Error"
+		=> "PHP 编译时错误",
+		"warning"
+		=> "警告",
+		"Error happened when compiling at least one of your PHP code"
+		=> "至少在编译其中一个您的 PHP 代码时发生编译错误",
+		"This usually means there is syntax error in your PHP code. Enable PHP error_log to see what parser error is it, fix your code"
+		=> "这通常意味着您的 PHP 代码有语法错误. 请启用 error_log 调查具体错误原因并修复您的代码",
+		"No error happened"
+		=> "未发生过错误",
+		"Busy Compiling"
+		=> "忙着编译",
+		"Cache marked as busy for compiling"
+		=> "编译中, 缓存标记为忙",
+		"It's ok if this status don't stay for long. Otherwise, it could be a sign of PHP crash/coredump, report to XCache devs"
+		=> "这个状态如果持续不就则无影响. 否则可能标志着 PHP 曾经发生异常退出, 如果是的话请报告给 XCache 开发组",
+		"Idle"
+		=> "空闲",
+		"Enabling VAR Cacher"
+		=> "启用 VAR 缓存器",
+		"PHP code that use XCache caching backend have to use other caching backend instead. Set xcache.var_size to non-zero"
+		=> "使用 XCache 作为数据缓存器的 PHP 代码将不得不采用其他缓存器代替. 设置 xcache.var_size 为非 0",
+		"Using VAR Cacher"
+		=> "使用 VAR 缓存器",
+		"No variable data cached"
+		=> "未缓存任何变量数据",
+		"Var Cacher won't work simply by enabling it. PHP code must call XCache APIs like xcache_set() to use it as cache backend. 3rd party web apps may come with XCache support, config it to use XCache as caching backend"
+		=> "只启用变量数据缓存器并无法将其利用起来. 必须通过 PHP 代码去调用 XCache API 接口(如 xcache_set() 函数) 将 XCache 作为缓存器. 第三方网页软件可能带有 XCache 支持, 留意其中的设置启用 XCache 作为缓存器",
+		"Cache in use"
+		=> "缓存使用中",
+		"Cache Size"
+		=> "缓存大小",
+		"Out of memory happened when trying to write to cache"
+		=> "存入缓存时发生内存不足",
+		"Increase xcache.size and/or xcache.var_size"
+		=> "加大 xcache.size 或 xcache.var_size",
+		"Enough"
+		=> "充足",
+		"Hash Slots"
+		=> "哈希槽",
+		"Slots value too big"
+		=> "哈希槽设定太大",
+		"A very small value is set to %s value and leave %s value is too big.\nDecrease %s if small cache is really what you want"
+		=> "设置给 %s 的值很小, 却采用过大的 %s. 如果您的确想要配置占用很少内存的缓存器, 可减少 %s",
+		"Slots value too small"
+		=> "哈希槽设定太小",
+		"So many item are cached. Increase %s to a more proper value"
+		=> "相当多的项目缓存了. 请适量加大 %s",
+		"Looks good"
+		=> "看起来还行",
+		"Cache Status"
+		=> "缓存状态",
+		"At least one of the caches is disabled. "
+		=> "至少一个缓存器是禁止状态",
+		"Enable the cache."
+		=> "启用已禁止的缓存器.",
+		"It was disabled by PHP crash/coredump handler or you disabled it manually."
+		=> "可能是在 PHP 异常退出时自动标记为禁止了, 或者您手工禁止了",
+		"You disabled it manually."
+		=> "您手工禁止了",
+		"If it was caused by PHP crash/coredump, report to XCache devs"
+		=> "如果是由于 PHP 异常退出造成, 请报告给 XCache 开发组",
+		"Coredump Directory"
+		=> "Coredump 目录",
+		"Enable coredump to save debugging information in case when PHP crash. It can also be enabled in other module like php-fpm beside XCache"
+		=> "启用 coredump 设置. 这样万一发生 PHP 异常退出时可保存调试信息. 这个功能也可以在其他地方启用, 如 php-fpm",
+		"Core files found:\n"
+		=> "发现 core 文件:\n",
+		"Disable XCache PHP Cacher (set xcache.size=0), remove the core file(s), then restart PHP. If core file appears again, report call stack backtrace in the core to XCache devs"
+		=> "禁止 XCache 缓存器 (设置 xcache.size=0), 删除 Core 文件, 再重启 PHP. 如果不用 XCache 时不出现 Core, 请从 Core 中取得 call stack back trace 信息报告回 XCache 开发组",
+		"You can see core files if PHP crash in %s if PHP crash"
+		=> "如果 PHP 异常退出, 您可以在 %s 目录看到 Core 文件",
+		"Readonly Protection"
+		=> "只读保护",
+		"Set to enabled but not available"
+		=> "设置为启用, 但目前不可用",
+		"Use xcache.mmap_path other than /dev/zero"
+		=> "设置 xcache.mmap_path 使用 /dev/zero 以外的值",
+		"Disabled"
+		=> "已禁止",
+		"Enable readonly_protection == --performance & ++stability. Disable readonly_protection == ++performance & --stability"
+		=> "启用 readonly_protection == --性能 & ++稳定性. 禁用 readonly_protection == ++性能 & --稳定性",
+		"XCache modules"
+		=> "XCache 模块",
+		"Acceptable. Module(s) listed are built into XCache but not for production server.\nLeave it as is if you're feeling good.\nRe-configure XCache with the module(s) disabled if you're strict with server security."
+		=> "可接受. 以上列出的模块已编译入 XCache, 但这些模块并非用于产业服务器.\n如果您觉得没大碍, 就保持现状.\n如果您对稳定性/安全性要求极其严格, 建议重新编译 XCache 不启用这些模块\n",
+		"XCache test setting"
+		=> "XCache 测试设置",
+		"xcache.test is for testing only, not for server. set it to off"
+		=> "xcache.test 仅用于开发测试用, 不用于服务器. 将它设置为 off",
+		"PHP Version"
+		=> "PHP 版本",
+		"The version of PHP you're using is known to be unstable: "
+		=> "您所使用的 PHP 版本, 是众所周知的不稳定版本: ",
+		"Upgrade to new version of PHP"
+		=> "升级到更新的 PHP 版本",
+		"Extension Compatibility"
+		=> "Extension 兼容性",
+		"Zend Optimizer loaded"
+		=> "Zend Optimizer 载入了",
+		"Optimizer feature of 'Zend Optimizer' is disabled by XCache due to compatibility reason; the Loader of it is still available, encoded files are still supported"
+		=> "由于兼容性问题, 'Zend Optimizer' 的优化器已被 XCache 禁止; 其加载器依然可用, 可继续使用 Zend 加密的文件",
 		);
 
Index: /trunk/htdocs/diagnosis/lang/en.po
===================================================================
--- /trunk/htdocs/diagnosis/lang/en.po	(revision 1101)
+++ /trunk/htdocs/diagnosis/lang/en.po	(revision 1103)
@@ -2,5 +2,5 @@
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 14:47+0800\n"
+"POT-Creation-Date: 2012-08-01 17:10+0800\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -25,5 +25,5 @@
 
 #: diagnosis.tpl.php:17
-msgid "Result/Suggestion"
+msgid "Explanation/Suggestion"
 msgstr ""
 
@@ -44,9 +44,9 @@
 
 #: index.php:87
-msgid "Cannot detect ini location"
+msgid "Cannot detect php.ini location"
 msgstr ""
 
 #: index.php:89
-msgid " (See above)"
+msgid "(See above)"
 msgstr ""
 
@@ -55,41 +55,66 @@
 msgstr ""
 
+#: index.php:90 index.php:129 index.php:135 index.php:183 index.php:285
+#: index.php:303 index.php:368
+msgid "error"
+msgstr ""
+
 #: index.php:93
 msgid "Loaded"
 msgstr ""
 
+#: index.php:93 index.php:141 index.php:158 index.php:175 index.php:189
+#: index.php:200 index.php:216 index.php:248 index.php:264 index.php:273
+#: index.php:291 index.php:309 index.php:332 index.php:347 index.php:373
+#: index.php:379 index.php:385
+msgid "info"
+msgstr ""
+
 #: index.php:124
 msgid "Enabling PHP Cacher"
 msgstr ""
 
+#: index.php:126 index.php:146 index.php:149 index.php:163 index.php:166
+#: index.php:180 index.php:207 index.php:253 index.php:270 index.php:300
+#: index.php:318 index.php:338
+msgid "skipped"
+msgstr ""
+
+#: index.php:130 index.php:184 index.php:274
+msgid "Not enabled"
+msgstr ""
+
 #: index.php:131
-msgid "Not enabled: Website is not accelerated by XCache"
-msgstr ""
-
-#: index.php:132
-msgid "Set xcache.size to non-zero, set xcache.cacher = On"
-msgstr ""
-
-#: index.php:138
-msgid "No php script cached: Website is not accelerated by XCache"
-msgstr ""
-
-#: index.php:139
-msgid "Set xcache.cacher = On"
-msgstr ""
-
-#: index.php:143 index.php:194 index.php:302 index.php:322 index.php:356
+msgid ""
+"Your PHP pages is not accelerated by XCache. Set xcache.size to non-zero, "
+"set xcache.cacher = On"
+msgstr ""
+
+#: index.php:136
+msgid "No php script cached"
+msgstr ""
+
+#: index.php:137
+msgid "Your PHP pages is not accelerated by XCache. Set xcache.cacher = On"
+msgstr ""
+
+#: index.php:141 index.php:189 index.php:292 index.php:310 index.php:342
 msgid "Enabled"
 msgstr ""
 
-#: index.php:146
+#: index.php:144
 msgid "PHP Compile Time Error"
 msgstr ""
 
-#: index.php:156
+#: index.php:152 index.php:169 index.php:193 index.php:210 index.php:234
+#: index.php:242 index.php:256 index.php:324 index.php:341
+msgid "warning"
+msgstr ""
+
+#: index.php:153
 msgid "Error happened when compiling at least one of your PHP code"
 msgstr ""
 
-#: index.php:157
+#: index.php:154
 msgid ""
 "This usually means there is syntax error in your PHP code. Enable PHP "
@@ -97,17 +122,17 @@
 msgstr ""
 
+#: index.php:158
+msgid "No error happened"
+msgstr ""
+
 #: index.php:161
-msgid "No error happened"
-msgstr ""
-
-#: index.php:164
 msgid "Busy Compiling"
 msgstr ""
 
-#: index.php:174
+#: index.php:170
 msgid "Cache marked as busy for compiling"
 msgstr ""
 
-#: index.php:175
+#: index.php:171
 msgid ""
 "It's ok if this status don't stay for long. Otherwise, it could be a sign of "
@@ -115,64 +140,62 @@
 msgstr ""
 
-#: index.php:179 index.php:274 index.php:345
+#: index.php:175 index.php:264 index.php:332
 msgid "Idle"
 msgstr ""
 
-#: index.php:182
+#: index.php:178
 msgid "Enabling VAR Cacher"
 msgstr ""
 
-#: index.php:189
-msgid "Not enabled: code that use xcache var cacher fall back to other backend"
-msgstr ""
-
-#: index.php:190
-msgid "Set xcache.var_size to non-zero"
-msgstr ""
-
-#: index.php:196
+#: index.php:185
+msgid ""
+"PHP code that use XCache caching backend have to use other caching backend "
+"instead. Set xcache.var_size to non-zero"
+msgstr ""
+
+#: index.php:191
 msgid "Using VAR Cacher"
 msgstr ""
 
-#: index.php:200
+#: index.php:194
 msgid "No variable data cached"
 msgstr ""
 
-#: index.php:201
+#: index.php:195
 msgid ""
 "Var Cacher won't work simply by enabling it. PHP code must call XCache APIs "
 "like xcache_set() to use it as cache backend. 3rd party web apps may come "
-"with XCache support, config it to use XCache as cachign backend"
-msgstr ""
-
-#: index.php:206
+"with XCache support, config it to use XCache as caching backend"
+msgstr ""
+
+#: index.php:200
 msgid "Cache in use"
 msgstr ""
 
+#: index.php:205
+msgid "Cache Size"
+msgstr ""
+
 #: index.php:211
-msgid "Cache Size"
-msgstr ""
-
-#: index.php:218
 msgid "Out of memory happened when trying to write to cache"
 msgstr ""
 
+#: index.php:212
+msgid "Increase xcache.size and/or xcache.var_size"
+msgstr ""
+
+#: index.php:216
+msgid "Enough"
+msgstr ""
+
 #: index.php:219
-msgid "Increase xcache.size and/or xcache.var_size"
-msgstr ""
-
-#: index.php:223
-msgid "Enough"
-msgstr ""
-
-#: index.php:226
-msgid "Slots"
-msgstr ""
-
-#: index.php:243
+msgid "Hash Slots"
+msgstr ""
+
+#: index.php:235
 msgid "Slots value too big"
 msgstr ""
 
-#: index.php:244
+#: index.php:236
 #, php-format
 msgid ""
@@ -181,88 +204,85 @@
 msgstr ""
 
-#: index.php:252
+#: index.php:243
 msgid "Slots value too small"
 msgstr ""
 
-#: index.php:253
+#: index.php:244
 #, php-format
 msgid "So many item are cached. Increase %s to a more proper value"
 msgstr ""
 
-#: index.php:257 index.php:387
+#: index.php:248 index.php:373 index.php:385
 msgid "Looks good"
 msgstr ""
 
+#: index.php:251
+msgid "Cache Status"
+msgstr ""
+
+#: index.php:257
+msgid "At least one of the caches is disabled. "
+msgstr ""
+
+#: index.php:258
+msgid "Enable the cache."
+msgstr ""
+
+#: index.php:259
+msgid ""
+"It was disabled by PHP crash/coredump handler or you disabled it manually."
+msgstr ""
+
+#: index.php:259
+msgid "You disabled it manually."
+msgstr ""
+
 #: index.php:260
-msgid "Cache Status"
-msgstr ""
-
-#: index.php:267
-msgid "At least one of the caches is disabled. "
+msgid "If it was caused by PHP crash/coredump, report to XCache devs"
 msgstr ""
 
 #: index.php:268
-msgid ""
-"It was disabled by PHP crash/coredump handler or You disabled it manually"
-msgstr ""
-
-#: index.php:268
-msgid "You disabled it manually"
-msgstr ""
-
-#: index.php:269
-msgid "Enable the cache."
-msgstr ""
-
-#: index.php:270
-msgid "If it was caused by PHP crash/coredump, report to XCache devs"
-msgstr ""
-
-#: index.php:278
 msgid "Coredump Directory"
 msgstr ""
 
-#: index.php:284
-msgid "Not enabled"
-msgstr ""
-
-#: index.php:285
-msgid ""
-"Enable coredump to know your PHP crash. It can also be enabled in fpm other "
-"than in XCache"
-msgstr ""
-
-#: index.php:296
+#: index.php:275
+msgid ""
+"Enable coredump to save debugging information in case when PHP crash. It can "
+"also be enabled in other module like php-fpm beside XCache"
+msgstr ""
+
+#: index.php:286
 msgid "Core files found:\n"
 msgstr ""
 
-#: index.php:297
-msgid ""
-"Disable XCache PHP Cacher (xcache.size=0), remove the core file(s). If core "
-"file appears again, report call stack backtrace in the core to XCache devs"
-msgstr ""
-
-#: index.php:303
+#: index.php:287
+msgid ""
+"Disable XCache PHP Cacher (set xcache.size=0), remove the core file(s), then "
+"restart PHP. If core file appears again, report call stack backtrace in the "
+"core to XCache devs"
+msgstr ""
+
+#: index.php:293
 #, php-format
 msgid "You can see core files if PHP crash in %s if PHP crash"
 msgstr ""
 
-#: index.php:308
+#: index.php:298
 msgid "Readonly Protection"
 msgstr ""
 
-#: index.php:315
+#: index.php:304
 msgid "Set to enabled but not available"
 msgstr ""
 
-#: index.php:316
+#: index.php:305
 msgid "Use xcache.mmap_path other than /dev/zero"
 msgstr ""
 
-#: index.php:322 index.php:361
+#: index.php:310 index.php:347
 msgid "Disabled"
 msgstr ""
 
-#: index.php:323
+#: index.php:311
 msgid ""
 "Enable readonly_protection == --performance & ++stability. Disable "
@@ -270,46 +290,46 @@
 msgstr ""
 
-#: index.php:328
+#: index.php:316
 msgid "XCache modules"
 msgstr ""
 
-#: index.php:339
-msgid ""
-"Acceptable. Module(s) listed above are built into XCache but not for "
-"production server\n"
+#: index.php:326
+msgid ""
+"Acceptable. Module(s) listed are built into XCache but not for production "
+"server.\n"
 "Leave it as is if you're feeling good.\n"
-"Re-configure XCache with the above module(s) disabled if you're strict with "
-"server security."
-msgstr ""
-
-#: index.php:349
+"Re-configure XCache with the module(s) disabled if you're strict with server "
+"security."
+msgstr ""
+
+#: index.php:336
 msgid "XCache test setting"
 msgstr ""
 
-#: index.php:357
+#: index.php:343
 msgid "xcache.test is for testing only, not for server. set it to off"
 msgstr ""
 
-#: index.php:364
+#: index.php:350
 msgid "PHP Version"
 msgstr ""
 
-#: index.php:383
+#: index.php:369
 msgid "The version of PHP you're using is known to be unstable: "
 msgstr ""
 
-#: index.php:384
+#: index.php:370
 msgid "Upgrade to new version of PHP"
 msgstr ""
 
-#: index.php:390
+#: index.php:376
 msgid "Extension Compatibility"
 msgstr ""
 
-#: index.php:395
+#: index.php:380
 msgid "Zend Optimizer loaded"
 msgstr ""
 
-#: index.php:396
+#: index.php:381
 msgid ""
 "Optimizer feature of 'Zend Optimizer' is disabled by XCache due to "
Index: /trunk/htdocs/diagnosis/lang/zh-simplified.po
===================================================================
--- /trunk/htdocs/diagnosis/lang/zh-simplified.po	(revision 1101)
+++ /trunk/htdocs/diagnosis/lang/zh-simplified.po	(revision 1103)
@@ -2,5 +2,5 @@
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 14:47+0800\n"
+"POT-Creation-Date: 2012-08-01 17:10+0800\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
@@ -10,30 +10,30 @@
 #: diagnosis.tpl.php:4
 msgid "Diagnosis Result"
-msgstr ""
+msgstr "诊断结果"
 
 #: diagnosis.tpl.php:8
 msgid "Item"
-msgstr ""
+msgstr "项目"
 
 #: diagnosis.tpl.php:11
 msgid "Level"
-msgstr ""
+msgstr "级别"
 
 #: diagnosis.tpl.php:14
 msgid "Result"
-msgstr ""
+msgstr "结果"
 
 #: diagnosis.tpl.php:17
-msgid "Result/Suggestion"
-msgstr ""
+msgid "Explanation/Suggestion"
+msgstr "解释/建议"
 
 #: index.php:77
 msgid "XCache extension"
-msgstr ""
+msgstr "XCache extension"
 
 #: index.php:81
 #, php-format
 msgid "Add extension=xcache.so (or xcache.dll) in %s"
-msgstr ""
+msgstr "在 %s 增加 extension=xcache.so (或 xcache.dll)"
 
 #: index.php:84
@@ -42,137 +42,172 @@
 "Please put a php.ini in %s and add extension=xcache.so (or xcache.dll) in it"
 msgstr ""
+"请在 %s 里放个 php.ini 并且在文件内写入 extension=xcache.so (或 xcache.dll)"
 
 #: index.php:87
-msgid "Cannot detect ini location"
-msgstr ""
+msgid "Cannot detect php.ini location"
+msgstr "无法检测 php.ini 位置"
 
 #: index.php:89
-msgid " (See above)"
-msgstr ""
+msgid "(See above)"
+msgstr "(参见上面)"
 
 #: index.php:90
 msgid "Not loaded"
-msgstr ""
+msgstr "未载入"
+
+#: index.php:90 index.php:129 index.php:135 index.php:183 index.php:285
+#: index.php:303 index.php:368
+msgid "error"
+msgstr "错误"
 
 #: index.php:93
 msgid "Loaded"
-msgstr ""
+msgstr "已载入"
+
+#: index.php:93 index.php:141 index.php:158 index.php:175 index.php:189
+#: index.php:200 index.php:216 index.php:248 index.php:264 index.php:273
+#: index.php:291 index.php:309 index.php:332 index.php:347 index.php:373
+#: index.php:379 index.php:385
+msgid "info"
+msgstr "信息"
 
 #: index.php:124
 msgid "Enabling PHP Cacher"
-msgstr ""
+msgstr "启用 PHP 缓存器"
+
+#: index.php:126 index.php:146 index.php:149 index.php:163 index.php:166
+#: index.php:180 index.php:207 index.php:253 index.php:270 index.php:300
+#: index.php:318 index.php:338
+msgid "skipped"
+msgstr "跳过"
+
+#: index.php:130 index.php:184 index.php:274
+msgid "Not enabled"
+msgstr "尚未启用"
 
 #: index.php:131
-msgid "Not enabled: Website is not accelerated by XCache"
-msgstr ""
-
-#: index.php:132
-msgid "Set xcache.size to non-zero, set xcache.cacher = On"
-msgstr ""
-
-#: index.php:138
-msgid "No php script cached: Website is not accelerated by XCache"
-msgstr ""
-
-#: index.php:139
-msgid "Set xcache.cacher = On"
-msgstr ""
-
-#: index.php:143 index.php:194 index.php:302 index.php:322 index.php:356
+msgid ""
+"Your PHP pages is not accelerated by XCache. Set xcache.size to non-zero, "
+"set xcache.cacher = On"
+msgstr ""
+"XCache 并未对您的 PHP 网页起到加速作用. 设置 xcache.size 为非 0, 设置 xcache."
+"cacher = On"
+
+#: index.php:136
+msgid "No php script cached"
+msgstr "未缓存任何 PHP 脚本"
+
+#: index.php:137
+msgid "Your PHP pages is not accelerated by XCache. Set xcache.cacher = On"
+msgstr "XCache 并未对您的 PHP 网页起到加速作用. 设置 xcache.cacher = On"
+
+#: index.php:141 index.php:189 index.php:292 index.php:310 index.php:342
 msgid "Enabled"
-msgstr ""
-
-#: index.php:146
+msgstr "已启用"
+
+#: index.php:144
 msgid "PHP Compile Time Error"
-msgstr ""
-
-#: index.php:156
+msgstr "PHP 编译时错误"
+
+#: index.php:152 index.php:169 index.php:193 index.php:210 index.php:234
+#: index.php:242 index.php:256 index.php:324 index.php:341
+msgid "warning"
+msgstr "警告"
+
+#: index.php:153
 msgid "Error happened when compiling at least one of your PHP code"
-msgstr ""
-
-#: index.php:157
+msgstr "至少在编译其中一个您的 PHP 代码时发生编译错误"
+
+#: index.php:154
 msgid ""
 "This usually means there is syntax error in your PHP code. Enable PHP "
 "error_log to see what parser error is it, fix your code"
 msgstr ""
+"这通常意味着您的 PHP 代码有语法错误. 请启用 error_log 调查具体错误原因并修复"
+"您的代码"
+
+#: index.php:158
+msgid "No error happened"
+msgstr "未发生过错误"
 
 #: index.php:161
-msgid "No error happened"
-msgstr ""
-
-#: index.php:164
 msgid "Busy Compiling"
-msgstr ""
-
-#: index.php:174
+msgstr "忙着编译"
+
+#: index.php:170
 msgid "Cache marked as busy for compiling"
-msgstr ""
-
-#: index.php:175
+msgstr "编译中, 缓存标记为忙"
+
+#: index.php:171
 msgid ""
 "It's ok if this status don't stay for long. Otherwise, it could be a sign of "
 "PHP crash/coredump, report to XCache devs"
 msgstr ""
-
-#: index.php:179 index.php:274 index.php:345
+"这个状态如果持续不就则无影响. 否则可能标志着 PHP 曾经发生异常退出, 如果是的话"
+"请报告给 XCache 开发组"
+
+#: index.php:175 index.php:264 index.php:332
 msgid "Idle"
-msgstr ""
-
-#: index.php:182
+msgstr "空闲"
+
+#: index.php:178
 msgid "Enabling VAR Cacher"
-msgstr ""
-
-#: index.php:189
-msgid "Not enabled: code that use xcache var cacher fall back to other backend"
-msgstr ""
-
-#: index.php:190
-msgid "Set xcache.var_size to non-zero"
-msgstr ""
-
-#: index.php:196
+msgstr "启用 VAR 缓存器"
+
+#: index.php:185
+msgid ""
+"PHP code that use XCache caching backend have to use other caching backend "
+"instead. Set xcache.var_size to non-zero"
+msgstr ""
+"使用 XCache 作为数据缓存器的 PHP 代码将不得不采用其他缓存器代替. 设置 xcache."
+"var_size 为非 0"
+
+#: index.php:191
 msgid "Using VAR Cacher"
-msgstr ""
-
-#: index.php:200
+msgstr "使用 VAR 缓存器"
+
+#: index.php:194
 msgid "No variable data cached"
-msgstr ""
-
-#: index.php:201
+msgstr "未缓存任何变量数据"
+
+#: index.php:195
 msgid ""
 "Var Cacher won't work simply by enabling it. PHP code must call XCache APIs "
 "like xcache_set() to use it as cache backend. 3rd party web apps may come "
-"with XCache support, config it to use XCache as cachign backend"
-msgstr ""
-
-#: index.php:206
+"with XCache support, config it to use XCache as caching backend"
+msgstr ""
+"只启用变量数据缓存器并无法将其利用起来. 必须通过 PHP 代码去调用 XCache API 接"
+"口(如 xcache_set() 函数) 将 XCache 作为缓存器. 第三方网页软件可能带有 XCache "
+"支持, 留意其中的设置启用 XCache 作为缓存器"
+
+#: index.php:200
 msgid "Cache in use"
-msgstr ""
+msgstr "缓存使用中"
+
+#: index.php:205
+msgid "Cache Size"
+msgstr "缓存大小"
 
 #: index.php:211
-msgid "Cache Size"
-msgstr ""
-
-#: index.php:218
 msgid "Out of memory happened when trying to write to cache"
-msgstr ""
+msgstr "存入缓存时发生内存不足"
+
+#: index.php:212
+msgid "Increase xcache.size and/or xcache.var_size"
+msgstr "加大 xcache.size 或 xcache.var_size"
+
+#: index.php:216
+msgid "Enough"
+msgstr "充足"
 
 #: index.php:219
-msgid "Increase xcache.size and/or xcache.var_size"
-msgstr ""
-
-#: index.php:223
-msgid "Enough"
-msgstr ""
-
-#: index.php:226
-msgid "Slots"
-msgstr ""
-
-#: index.php:243
+msgid "Hash Slots"
+msgstr "哈希槽"
+
+#: index.php:235
 msgid "Slots value too big"
-msgstr ""
-
-#: index.php:244
+msgstr "哈希槽设定太大"
+
+#: index.php:236
 #, php-format
 msgid ""
@@ -180,136 +215,145 @@
 "Decrease %s if small cache is really what you want"
 msgstr ""
-
-#: index.php:252
+"设置给 %s 的值很小, 却采用过大的 %s. 如果您的确想要配置占用很少内存的缓存器, "
+"可减少 %s"
+
+#: index.php:243
 msgid "Slots value too small"
-msgstr ""
-
-#: index.php:253
+msgstr "哈希槽设定太小"
+
+#: index.php:244
 #, php-format
 msgid "So many item are cached. Increase %s to a more proper value"
-msgstr ""
-
-#: index.php:257 index.php:387
+msgstr "相当多的项目缓存了. 请适量加大 %s"
+
+#: index.php:248 index.php:373 index.php:385
 msgid "Looks good"
-msgstr ""
+msgstr "看起来还行"
+
+#: index.php:251
+msgid "Cache Status"
+msgstr "缓存状态"
+
+#: index.php:257
+msgid "At least one of the caches is disabled. "
+msgstr "至少一个缓存器是禁止状态"
+
+#: index.php:258
+msgid "Enable the cache."
+msgstr "启用已禁止的缓存器."
+
+#: index.php:259
+msgid ""
+"It was disabled by PHP crash/coredump handler or you disabled it manually."
+msgstr "可能是在 PHP 异常退出时自动标记为禁止了, 或者您手工禁止了"
+
+#: index.php:259
+msgid "You disabled it manually."
+msgstr "您手工禁止了"
 
 #: index.php:260
-msgid "Cache Status"
-msgstr ""
-
-#: index.php:267
-msgid "At least one of the caches is disabled. "
-msgstr ""
+msgid "If it was caused by PHP crash/coredump, report to XCache devs"
+msgstr "如果是由于 PHP 异常退出造成, 请报告给 XCache 开发组"
 
 #: index.php:268
-msgid ""
-"It was disabled by PHP crash/coredump handler or You disabled it manually"
-msgstr ""
-
-#: index.php:268
-msgid "You disabled it manually"
-msgstr ""
-
-#: index.php:269
-msgid "Enable the cache."
-msgstr ""
-
-#: index.php:270
-msgid "If it was caused by PHP crash/coredump, report to XCache devs"
-msgstr ""
-
-#: index.php:278
 msgid "Coredump Directory"
-msgstr ""
-
-#: index.php:284
-msgid "Not enabled"
-msgstr ""
-
-#: index.php:285
-msgid ""
-"Enable coredump to know your PHP crash. It can also be enabled in fpm other "
-"than in XCache"
-msgstr ""
-
-#: index.php:296
+msgstr "Coredump 目录"
+
+#: index.php:275
+msgid ""
+"Enable coredump to save debugging information in case when PHP crash. It can "
+"also be enabled in other module like php-fpm beside XCache"
+msgstr ""
+"启用 coredump 设置. 这样万一发生 PHP 异常退出时可保存调试信息. 这个功能也可以"
+"在其他地方启用, 如 php-fpm"
+
+#: index.php:286
 msgid "Core files found:\n"
-msgstr ""
-
-#: index.php:297
-msgid ""
-"Disable XCache PHP Cacher (xcache.size=0), remove the core file(s). If core "
-"file appears again, report call stack backtrace in the core to XCache devs"
-msgstr ""
-
-#: index.php:303
+msgstr "发现 core 文件:\n"
+
+#: index.php:287
+msgid ""
+"Disable XCache PHP Cacher (set xcache.size=0), remove the core file(s), then "
+"restart PHP. If core file appears again, report call stack backtrace in the "
+"core to XCache devs"
+msgstr ""
+"禁止 XCache 缓存器 (设置 xcache.size=0), 删除 Core 文件, 再重启 PHP. 如果不"
+"用 XCache 时不出现 Core, 请从 Core 中取得 call stack back trace 信息报告回 "
+"XCache 开发组"
+
+#: index.php:293
 #, php-format
 msgid "You can see core files if PHP crash in %s if PHP crash"
-msgstr ""
-
-#: index.php:308
+msgstr "如果 PHP 异常退出, 您可以在 %s 目录看到 Core 文件"
+
+#: index.php:298
 msgid "Readonly Protection"
-msgstr ""
-
-#: index.php:315
+msgstr "只读保护"
+
+#: index.php:304
 msgid "Set to enabled but not available"
-msgstr ""
-
-#: index.php:316
+msgstr "设置为启用, 但目前不可用"
+
+#: index.php:305
 msgid "Use xcache.mmap_path other than /dev/zero"
-msgstr ""
-
-#: index.php:322 index.php:361
+msgstr "设置 xcache.mmap_path 使用 /dev/zero 以外的值"
+
+#: index.php:310 index.php:347
 msgid "Disabled"
-msgstr ""
-
-#: index.php:323
+msgstr "已禁止"
+
+#: index.php:311
 msgid ""
 "Enable readonly_protection == --performance & ++stability. Disable "
 "readonly_protection == ++performance & --stability"
 msgstr ""
-
-#: index.php:328
+"启用 readonly_protection == --性能 & ++稳定性. 禁用 readonly_protection == +"
+"+性能 & --稳定性"
+
+#: index.php:316
 msgid "XCache modules"
-msgstr ""
-
-#: index.php:339
-msgid ""
-"Acceptable. Module(s) listed above are built into XCache but not for "
-"production server\n"
+msgstr "XCache 模块"
+
+#: index.php:326
+msgid ""
+"Acceptable. Module(s) listed are built into XCache but not for production "
+"server.\n"
 "Leave it as is if you're feeling good.\n"
-"Re-configure XCache with the above module(s) disabled if you're strict with "
-"server security."
-msgstr ""
-
-#: index.php:349
+"Re-configure XCache with the module(s) disabled if you're strict with server "
+"security."
+msgstr ""
+"可接受. 以上列出的模块已编译入 XCache, 但这些模块并非用于产业服务器.\n"
+"如果您觉得没大碍, 就保持现状.\n"
+"如果您对稳定性/安全性要求极其严格, 建议重新编译 XCache 不启用这些模块\n"
+
+#: index.php:336
 msgid "XCache test setting"
-msgstr ""
-
-#: index.php:357
+msgstr "XCache 测试设置"
+
+#: index.php:343
 msgid "xcache.test is for testing only, not for server. set it to off"
-msgstr ""
-
-#: index.php:364
+msgstr "xcache.test 仅用于开发测试用, 不用于服务器. 将它设置为 off"
+
+#: index.php:350
 msgid "PHP Version"
-msgstr ""
-
-#: index.php:383
+msgstr "PHP 版本"
+
+#: index.php:369
 msgid "The version of PHP you're using is known to be unstable: "
-msgstr ""
-
-#: index.php:384
+msgstr "您所使用的 PHP 版本, 是众所周知的不稳定版本: "
+
+#: index.php:370
 msgid "Upgrade to new version of PHP"
-msgstr ""
-
-#: index.php:390
+msgstr "升级到更新的 PHP 版本"
+
+#: index.php:376
 msgid "Extension Compatibility"
-msgstr ""
-
-#: index.php:395
+msgstr "Extension 兼容性"
+
+#: index.php:380
 msgid "Zend Optimizer loaded"
-msgstr ""
-
-#: index.php:396
+msgstr "Zend Optimizer 载入了"
+
+#: index.php:381
 msgid ""
 "Optimizer feature of 'Zend Optimizer' is disabled by XCache due to "
@@ -317,2 +361,4 @@
 "still supported"
 msgstr ""
+"由于兼容性问题, 'Zend Optimizer' 的优化器已被 XCache 禁止; 其加载器依然可用, "
+"可继续使用 Zend 加密的文件"
Index: /trunk/htdocs/diagnosis/diagnosis.tpl.php
===================================================================
--- /trunk/htdocs/diagnosis/diagnosis.tpl.php	(revision 1092)
+++ /trunk/htdocs/diagnosis/diagnosis.tpl.php	(revision 1103)
@@ -15,5 +15,5 @@
 		</th>
 		<th>
-			<?php echo _T("Result/Suggestion"); ?>
+			<?php echo _T("Explanation/Suggestion"); ?>
 		</th>
 	</tr>
@@ -21,5 +21,5 @@
 	<tr class="<?php echo $note['type']; ?>">
 		<td nowrap="nowrap" align="right"><?php echo $note['item']; ?></td>
-		<td nowrap="nowrap"><?php echo ucfirst($note['type']); ?></td>
+		<td nowrap="nowrap"><?php echo ucfirst(__($note['type'])); ?></td>
 		<td nowrap="nowrap"><?php echo nl2br($note['result']); ?></td>
 		<td><?php echo nl2br($note['suggestion']); ?></td>
Index: /trunk/devel/prepare.mak
===================================================================
--- /trunk/devel/prepare.mak	(revision 1101)
+++ /trunk/devel/prepare.mak	(revision 1103)
@@ -119,5 +119,5 @@
 	mv "$$@".tmp "$$@"
 
-  htdocs/$(1)/lang/$(1).pot: $(shell find htdocs/$(1) -type f | grep php | grep -v lang | grep -v config)
+  htdocs/$(1)/lang/$(1).pot: $(shell find htdocs/$(1) -type f | grep php | grep -v lang | grep -v config | grep -vF .swp)
 
 endef
Index: /trunk/devel/po2php.awk
===================================================================
--- /trunk/devel/po2php.awk	(revision 1103)
+++ /trunk/devel/po2php.awk	(revision 1103)
@@ -0,0 +1,67 @@
+#!/usr/bin/awk -f
+BEGIN {
+	print "<?php";
+	print "// auto generated, do not modify";
+	print "$strings += array(";
+}
+
+function flushOut() {
+	if (section) {
+		if (section == "msgstr") {
+			if (msgid == "") {
+			}
+			else if (msgstr == "") {
+			}
+			else {
+				print "\t\t\""msgid"\"";
+				print "\t\t=> \""msgstr"\",";
+			}
+		}
+		else {
+			print "unexpected section " section;
+			exit 1;
+		}
+		section = null;
+	}
+}
+
+/^msgid ".*"$/ {
+	$0 = gensub(/^msgid "(.*)"$/, "\\1", $0);
+
+	section = "msgid";
+	msgid = $0;
+	next;
+}
+/^msgstr ".*"$/ {
+	$0 = gensub(/^msgstr "(.*)"$/, "\\1", $0);
+
+	section = "msgstr";
+	msgstr = $0;
+	next;
+}
+/^".*"$/ {
+	$0 = gensub(/^"(.*)"$/, "\\1", $0);
+	if (section == "msgid") {
+		msgid = msgid $0;
+	}
+	else {
+		msgstr = msgstr $0;
+	}
+	next;
+}
+/^$/ {
+	flushOut();
+	next;
+}
+/^#/ {
+	next;
+}
+/./ {
+	print "error", $0;
+	exit 1;
+}
+END {
+	flushOut();
+	print "\t\t);";
+	print "";
+}
Index: /trunk/devel/run
===================================================================
--- /trunk/devel/run	(revision 1102)
+++ /trunk/devel/run	(revision 1103)
@@ -17,8 +17,9 @@
 	exec $MAKE -f devel/prepare.mak "${args[@]}"
 	;;
-*langphp)
+po2php)
+	./run mergepo
 	find htdocs -iname '*.po' | while read -r i; do
 		phpfile=${i/.po/.php}
-		devel/updatelangphp.awk < $i > $phpfile.tmp
+		devel/po2php.awk < $i > $phpfile.tmp
 		mv $phpfile.tmp $phpfile
 	done
Index: /unk/devel/updatelangphp.awk
===================================================================
--- /trunk/devel/updatelangphp.awk	(revision 1102)
+++ 	(revision )
@@ -1,67 +1,0 @@
-#!/usr/bin/awk -f
-BEGIN {
-	print "<?php";
-	print "// auto generated, do not modify";
-	print "$strings += array(";
-}
-
-function flushOut() {
-	if (section) {
-		if (section == "msgstr") {
-			if (msgid == "") {
-			}
-			else if (msgstr == "") {
-			}
-			else {
-				print "\t\t'"msgid"'";
-				print "\t\t=> '"msgstr"',";
-			}
-		}
-		else {
-			print "unexpected section " section;
-			exit 1;
-		}
-		section = null;
-	}
-}
-
-/^msgid ".*"$/ {
-	$0 = gensub(/^msgid "(.*)"$/, "\\1", $0);
-
-	section = "msgid";
-	msgid = $0;
-	next;
-}
-/^msgstr ".*"$/ {
-	$0 = gensub(/^msgstr "(.*)"$/, "\\1", $0);
-
-	section = "msgstr";
-	msgstr = $0;
-	next;
-}
-/^".*"$/ {
-	$0 = gensub(/^"(.*)"$/, "\\1", $0);
-	if (section == "msgid") {
-		msgid = msgid $0;
-	}
-	else {
-		msgstr = msgstr $0;
-	}
-	next;
-}
-/^$/ {
-	flushOut();
-	next;
-}
-/^#/ {
-	next;
-}
-/./ {
-	print "error", $0;
-	exit 1;
-}
-END {
-	flushOut();
-	print "\t\t);";
-	print "";
-}