Index: /trunk/htdocs/coverager/common.php
===================================================================
--- /trunk/htdocs/coverager/common.php	(revision 1077)
+++ /trunk/htdocs/coverager/common.php	(revision 1099)
@@ -3,5 +3,5 @@
 require_once "../common/common.php";
 
-include get_language_file("coverager");
+include get_language_file("./lang");
 $module = "coverager";
 
Index: /trunk/htdocs/coverager/lang/en.php
===================================================================
--- /trunk/htdocs/coverager/lang/en.php	(revision 1099)
+++ /trunk/htdocs/coverager/lang/en.php	(revision 1099)
@@ -0,0 +1,5 @@
+<?php
+
+$GLOBALS['show_todo_strings'] = false;
+
+?>
Index: /trunk/htdocs/coverager/lang/zh-simplified.php
===================================================================
--- /trunk/htdocs/coverager/lang/zh-simplified.php	(revision 1099)
+++ /trunk/htdocs/coverager/lang/zh-simplified.php	(revision 1099)
@@ -0,0 +1,25 @@
+<?php
+
+$strings += array(
+		'root'
+		=> '开始',
+		'Directory'
+		=> '目录',
+		'File'
+		=> '文件',
+		'Percent'
+		=> '覆盖率',
+		'Hits'
+		=> '命中',
+		'Lines'
+		=> '行数',
+		'TODO'
+		=> '闲置文件',
+		'XCache PHP Code Coverage Viewer'
+		=> 'XCache PHP 代码覆盖查看器',
+		'module'
+		=> '模块',
+		''
+		=> '',
+		);
+
Index: /unk/htdocs/coverager/coverager-en.lang.php
===================================================================
--- /trunk/htdocs/coverager/coverager-en.lang.php	(revision 1053)
+++ 	(revision )
@@ -1,5 +1,0 @@
-<?php
-
-$GLOBALS['show_todo_strings'] = false;
-
-?>
Index: /unk/htdocs/coverager/coverager-zh-simplified.lang.php
===================================================================
--- /trunk/htdocs/coverager/coverager-zh-simplified.lang.php	(revision 1053)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?php
-
-$strings += array(
-		'root'
-		=> '开始',
-		'Directory'
-		=> '目录',
-		'File'
-		=> '文件',
-		'Percent'
-		=> '覆盖率',
-		'Hits'
-		=> '命中',
-		'Lines'
-		=> '行数',
-		'TODO'
-		=> '闲置文件',
-		'XCache PHP Code Coverage Viewer'
-		=> 'XCache PHP 代码覆盖查看器',
-		'module'
-		=> '模块',
-		''
-		=> '',
-		);
-
Index: /trunk/htdocs/diagnosis/index.php
===================================================================
--- /trunk/htdocs/diagnosis/index.php	(revision 1093)
+++ /trunk/htdocs/diagnosis/index.php	(revision 1099)
@@ -2,4 +2,6 @@
 
 include "../common/common.php";
+include get_language_file("./lang");
+
 $knownUnstablePhpVersions = array(
 		array('=', '5.3.14', 'random corrupt memory on high concurrent'),
Index: /trunk/htdocs/cacher/edit.php
===================================================================
--- /trunk/htdocs/cacher/edit.php	(revision 1078)
+++ /trunk/htdocs/cacher/edit.php	(revision 1099)
@@ -37,6 +37,4 @@
 }
 
-$module = "cacher";
-
 include "edit.tpl.php";
 
Index: /trunk/htdocs/cacher/index.php
===================================================================
--- /trunk/htdocs/cacher/index.php	(revision 1090)
+++ /trunk/htdocs/cacher/index.php	(revision 1099)
@@ -254,5 +254,4 @@
 // }}}
 
-$module = "cacher";
 xcache_count(XC_TYPE_PHP); // trigger auth
 if (!extension_loaded('XCache')) {
Index: /trunk/htdocs/cacher/common.php
===================================================================
--- /trunk/htdocs/cacher/common.php	(revision 1078)
+++ /trunk/htdocs/cacher/common.php	(revision 1099)
@@ -3,3 +3,5 @@
 require_once "../common/common.php";
 
-include get_language_file("cacher");
+include get_language_file("./lang");
+$module = "cacher";
+
Index: /trunk/htdocs/cacher/lang/en.php
===================================================================
--- /trunk/htdocs/cacher/lang/en.php	(revision 1099)
+++ /trunk/htdocs/cacher/lang/en.php	(revision 1099)
@@ -0,0 +1,81 @@
+<?php
+
+$GLOBALS['config']['show_todo_strings'] = false;
+
+$strings = array(
+		'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.used'
+		=> 'Used|Used Memory, used 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_avg_h'
+		=> 'Hits/H|Average Hits per Hour. Only last 24 hours is logged',
+		'cache.hits_graph'
+		=> 'Hits*24H|Hits graph of last 24 hours',
+		'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',
+		'entry.id'
+		=> 'Id|',
+		'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.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.class_cnt'
+		=> 'Cls.|Count of classes',
+		'entry.function_cnt'
+		=> 'Funcs|Count of functions',
+		'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',
+		'entry.remove'
+		=> 'Remove|',
+);
+
Index: /trunk/htdocs/cacher/lang/zh-simplified.php
===================================================================
--- /trunk/htdocs/cacher/lang/zh-simplified.php	(revision 1099)
+++ /trunk/htdocs/cacher/lang/zh-simplified.php	(revision 1099)
@@ -0,0 +1,141 @@
+<?php
+
+$strings += array(
+		'XCache Help'
+		=> 'XCache 帮助信息',
+		'Help'
+		=> '帮助',
+		'Clear'
+		=> '清除',
+		'Sure?'
+		=> '确认?',
+		'% Free'
+		=> '% 剩余',
+		'% Used'
+		=> '% 已用',
+		'Hits'
+		=> '命中',
+		'Normal'
+		=> '正常',
+		'Compiling'
+		=> '编译中',
+		'Disabled'
+		=> '禁用',
+		'Disable'
+		=> '禁用',
+		'Enable'
+		=> '启用',
+		'Modify'
+		=> '修改',
+		'See also'
+		=> '建议参考',
+		'Legends:'
+		=> '图例:',
+		'Used Blocks'
+		=> '已用块',
+		'Free Blocks'
+		=> '未用块',
+		'Total'
+		=> '总共',
+		'Caches'
+		=> '缓存区',
+		'php Cached'
+		=> '缓存的 PHP 脚本',
+		'php Deleted'
+		=> '待删 PHP 缓存',
+		'var Cached'
+		=> '缓存的变量',
+		'var Deleted'
+		=> '待删变量',
+		'Summary'
+		=> '摘要信息',
+		'List PHP'
+		=> '列出PHP',
+		'List Var Data'
+		=> '列变量数据',
+		'XCache %s Administration'
+		=> 'XCache %s 管理页面',
+		'Module Info'
+		=> '模块信息',
+		'Remove Selected'
+		=> '删除所选',
+		'Editing Variable %s'
+		=> '正在编辑变量 %s',
+		'Set %s in config to enable'
+		=> '请在配置文件中设置 %s 启用本功能',
+		'cache.cache'
+		=> '缓存|',
+		'cache.slots'
+		=> '槽|Hash 槽个数, 对应 php.ini 里的设置',
+		'cache.size'
+		=> '大小|共享内存区大小, 单位: 字节',
+		'cache.avail'
+		=> '剩余|可用内存, 对应共享内存区的剩余内存字节数',
+		'cache.used'
+		=> '已用|已用内存, 对应共享内存区的已用内存字节数',
+		'cache.blocksgraph'
+		=> '百分比图|条状显示可用内存的比例, 以及显示分配块状态',
+		'cache.operations'
+		=> '操作|点击按钮清除对应共享内存区的数据',
+		'cache.status'
+		=> '状态|状态标记. 当共享内存区正在编译 PHP 脚本时标记为 "编译中". 当共享内存区暂停使用时标记为 "禁用"',
+		'cache.hits'
+		=> '命中|共享内存命中次数, 命中=从该共享内存载入 PHP 或者变量',
+		'cache.hits_avg_h'
+		=> '命中/H|每小时命中次数. 只统计最后 24 小时',
+		'cache.hits_graph'
+		=> '24H 分布|24 小时命中分布图. 图表现是最后 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|垃圾回收的倒计时',
+		'entry.id'
+		=> 'Id|',
+		'entry.name'
+		=> '项目名/文件名|项目名或者文件名',
+		'entry.hits'
+		=> '命中|该项目被命中的次数 (从共享内存区载入)',
+		'entry.size'
+		=> '大小|项目在共享内存里占用字节数',
+		'entry.refcount'
+		=> '引用数|项目依然被其他进程占据的引用次数',
+		'entry.phprefcount'
+		=> '共享数|与本项目相同 PHP 代码的个数',
+		'entry.file_size'
+		=> '源大小|源文件大小',
+		'entry.file_mtime'
+		=> '修改|源文件最后修改时间',
+		'entry.file_device'
+		=> 'dev|源文件所在设备ID',
+		'entry.file_inode'
+		=> 'ino|源文件的 inode',
+		'entry.class_cnt'
+		=> '类|类个数',
+		'entry.function_cnt'
+		=> '函数|函数个数',
+		'entry.hash'
+		=> '哈希|该项目的哈希值',
+		'entry.atime'
+		=> '访问|最后访问该项目的时间',
+		'entry.ctime'
+		=> '创建|该项目被创建于共享内的时间',
+		'entry.delete'
+		=> '删除|该项目被决定删除的时间',
+		'entry.remove'
+		=> '删除|',
+);
+
Index: /trunk/htdocs/cacher/lang/zh-traditional.php
===================================================================
--- /trunk/htdocs/cacher/lang/zh-traditional.php	(revision 1099)
+++ /trunk/htdocs/cacher/lang/zh-traditional.php	(revision 1099)
@@ -0,0 +1,141 @@
+<?php
+
+$strings += array(
+		'XCache Help'
+		=> 'XCache 說明訊息',
+		'Help'
+		=> '說明',
+		'Clear'
+		=> '清除',
+		'Sure?'
+		=> '確認?',
+		'% Free'
+		=> '% 剩余',
+		'% Used'
+		=> '% 已用',
+		'Hits'
+		=> '命中',
+		'Normal'
+		=> '正常',
+		'Compiling'
+		=> '編譯中',
+		'Disabled'
+		=> '禁用',
+		'Disable'
+		=> '禁用',
+		'Enable'
+		=> '啟用',
+		'Modify'
+		=> '修改',
+		'See also'
+		=> '建議參考',
+		'Legends:'
+		=> '图例:',
+		'Used Blocks'
+		=> '已用块',
+		'Free Blocks'
+		=> '未用块',
+		'Total'
+		=> '总共',
+		'Caches'
+		=> '快取',
+		'php Cached'
+		=> '快取的 PHP 指令',
+		'php Deleted'
+		=> '待刪 PHP 指令',
+		'var Cached'
+		=> '快取的變數',
+		'var Deleted'
+		=> '待刪變數',
+		'Summary'
+		=> '簡要訊息',
+		'List PHP'
+		=> '列出PHP',
+		'List Var Data'
+		=> '列變數資料',
+		'XCache %s Administration'
+		=> 'XCache %s 管理頁面',
+		'Module Info'
+		=> '組元訊息',
+		'Remove Selected'
+		=> '移除所选',
+		'Editing Variable %s'
+		=> '正在编辑变量 %s',
+		'Set %s in config to enable'
+		=> '請在配置文件中設置 %s 啟用本功能',
+		'cache.cache'
+		=> '快取|',
+		'cache.slots'
+		=> '槽|Hash 槽個數，對應 php.ini 裡的設置',
+		'cache.size'
+		=> '大小|共享記憶體區大小，單位：位元',
+		'cache.avail'
+		=> '剩餘|可用記憶體，對應共享記憶體區的剩餘記憶體位元數',
+		'cache.used'
+		=> '已用|已用内存, 对应共享内存区的已用内存字节数',
+		'cache.blocksgraph'
+		=> '百分比图|條狀顯示可用記憶體的比例',
+		'cache.operations'
+		=> '操作按鈕|點擊按鈕清除對應共享記憶體區的資料',
+		'cache.status'
+		=> '狀態|狀態標記. 當共享內存區正在編譯 PHP 腳本時標記為 "編譯中". 當共享內存區暫停使用時標記為 "禁用"',
+		'cache.hits'
+		=> '命中|共享記憶體命中次數，命中=從該共享記憶體載入 PHP 或者變數',
+		'cache.hits_avg_h'
+		=> '命中/H|每小时命中次数. 只统计最后 24 小时',
+		'cache.hits_graph'
+		=> '24H 分布|24 小时命中分布图. 图表现是最后 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|垃圾回收的倒數計時',
+		'entry.id'
+		=> 'Id|',
+		'entry.name'
+		=> '項目名稱/檔案名稱|項目名稱或者檔案名稱',
+		'entry.hits'
+		=> '命中|該項目被命中的次數 (從共享記憶體區載入)',
+		'entry.size'
+		=> '大小|項目在共享記憶體裡佔用位元數',
+		'entry.refcount'
+		=> '引用數|項目依然被其他程序佔用的引用次數',
+		'entry.phprefcount'
+		=> '共享|與本項目相同 PHP 內容的个數',
+		'entry.file_size'
+		=> '源大小|原始檔案大小',
+		'entry.file_mtime'
+		=> '修改|原始檔案最後修改時間',
+		'entry.file_device'
+		=> 'dev|原始檔案所在設備ID',
+		'entry.file_inode'
+		=> 'ino|原始檔案的inode',
+		'entry.class_cnt'
+		=> '类|类个数',
+		'entry.function_cnt'
+		=> '函数|函数个数',
+		'entry.hash'
+		=> 'Hash|Hash',
+		'entry.atime'
+		=> '存取|最後存取該項目的時間',
+		'entry.ctime'
+		=> '建立|該項目被建立於共享內的時間',
+		'entry.delete'
+		=> '移除|該項目被移除於共享內的時間',
+		'entry.remove'
+		=> '移除|',
+);
+
Index: /unk/htdocs/cacher/cacher-en.lang.php
===================================================================
--- /trunk/htdocs/cacher/cacher-en.lang.php	(revision 1063)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?php
-
-$GLOBALS['config']['show_todo_strings'] = false;
-
-$strings = array(
-		'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.used'
-		=> 'Used|Used Memory, used 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_avg_h'
-		=> 'Hits/H|Average Hits per Hour. Only last 24 hours is logged',
-		'cache.hits_graph'
-		=> 'Hits*24H|Hits graph of last 24 hours',
-		'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',
-		'entry.id'
-		=> 'Id|',
-		'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.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.class_cnt'
-		=> 'Cls.|Count of classes',
-		'entry.function_cnt'
-		=> 'Funcs|Count of functions',
-		'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',
-		'entry.remove'
-		=> 'Remove|',
-);
-
Index: /unk/htdocs/cacher/cacher-zh-simplified.lang.php
===================================================================
--- /trunk/htdocs/cacher/cacher-zh-simplified.lang.php	(revision 1078)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?php
-
-$strings += array(
-		'XCache Help'
-		=> 'XCache 帮助信息',
-		'Help'
-		=> '帮助',
-		'Clear'
-		=> '清除',
-		'Sure?'
-		=> '确认?',
-		'% Free'
-		=> '% 剩余',
-		'% Used'
-		=> '% 已用',
-		'Hits'
-		=> '命中',
-		'Normal'
-		=> '正常',
-		'Compiling'
-		=> '编译中',
-		'Disabled'
-		=> '禁用',
-		'Disable'
-		=> '禁用',
-		'Enable'
-		=> '启用',
-		'Modify'
-		=> '修改',
-		'See also'
-		=> '建议参考',
-		'Legends:'
-		=> '图例:',
-		'Used Blocks'
-		=> '已用块',
-		'Free Blocks'
-		=> '未用块',
-		'Total'
-		=> '总共',
-		'Caches'
-		=> '缓存区',
-		'php Cached'
-		=> '缓存的 PHP 脚本',
-		'php Deleted'
-		=> '待删 PHP 缓存',
-		'var Cached'
-		=> '缓存的变量',
-		'var Deleted'
-		=> '待删变量',
-		'Summary'
-		=> '摘要信息',
-		'List PHP'
-		=> '列出PHP',
-		'List Var Data'
-		=> '列变量数据',
-		'XCache %s Administration'
-		=> 'XCache %s 管理页面',
-		'Module Info'
-		=> '模块信息',
-		'Remove Selected'
-		=> '删除所选',
-		'Editing Variable %s'
-		=> '正在编辑变量 %s',
-		'Set %s in config to enable'
-		=> '请在配置文件中设置 %s 启用本功能',
-		'cache.cache'
-		=> '缓存|',
-		'cache.slots'
-		=> '槽|Hash 槽个数, 对应 php.ini 里的设置',
-		'cache.size'
-		=> '大小|共享内存区大小, 单位: 字节',
-		'cache.avail'
-		=> '剩余|可用内存, 对应共享内存区的剩余内存字节数',
-		'cache.used'
-		=> '已用|已用内存, 对应共享内存区的已用内存字节数',
-		'cache.blocksgraph'
-		=> '百分比图|条状显示可用内存的比例, 以及显示分配块状态',
-		'cache.operations'
-		=> '操作|点击按钮清除对应共享内存区的数据',
-		'cache.status'
-		=> '状态|状态标记. 当共享内存区正在编译 PHP 脚本时标记为 "编译中". 当共享内存区暂停使用时标记为 "禁用"',
-		'cache.hits'
-		=> '命中|共享内存命中次数, 命中=从该共享内存载入 PHP 或者变量',
-		'cache.hits_avg_h'
-		=> '命中/H|每小时命中次数. 只统计最后 24 小时',
-		'cache.hits_graph'
-		=> '24H 分布|24 小时命中分布图. 图表现是最后 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|垃圾回收的倒计时',
-		'entry.id'
-		=> 'Id|',
-		'entry.name'
-		=> '项目名/文件名|项目名或者文件名',
-		'entry.hits'
-		=> '命中|该项目被命中的次数 (从共享内存区载入)',
-		'entry.size'
-		=> '大小|项目在共享内存里占用字节数',
-		'entry.refcount'
-		=> '引用数|项目依然被其他进程占据的引用次数',
-		'entry.phprefcount'
-		=> '共享数|与本项目相同 PHP 代码的个数',
-		'entry.file_size'
-		=> '源大小|源文件大小',
-		'entry.file_mtime'
-		=> '修改|源文件最后修改时间',
-		'entry.file_device'
-		=> 'dev|源文件所在设备ID',
-		'entry.file_inode'
-		=> 'ino|源文件的 inode',
-		'entry.class_cnt'
-		=> '类|类个数',
-		'entry.function_cnt'
-		=> '函数|函数个数',
-		'entry.hash'
-		=> '哈希|该项目的哈希值',
-		'entry.atime'
-		=> '访问|最后访问该项目的时间',
-		'entry.ctime'
-		=> '创建|该项目被创建于共享内的时间',
-		'entry.delete'
-		=> '删除|该项目被决定删除的时间',
-		'entry.remove'
-		=> '删除|',
-);
-
Index: /unk/htdocs/cacher/cacher-zh-traditional.lang.php
===================================================================
--- /trunk/htdocs/cacher/cacher-zh-traditional.lang.php	(revision 1078)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?php
-
-$strings += array(
-		'XCache Help'
-		=> 'XCache 說明訊息',
-		'Help'
-		=> '說明',
-		'Clear'
-		=> '清除',
-		'Sure?'
-		=> '確認?',
-		'% Free'
-		=> '% 剩余',
-		'% Used'
-		=> '% 已用',
-		'Hits'
-		=> '命中',
-		'Normal'
-		=> '正常',
-		'Compiling'
-		=> '編譯中',
-		'Disabled'
-		=> '禁用',
-		'Disable'
-		=> '禁用',
-		'Enable'
-		=> '啟用',
-		'Modify'
-		=> '修改',
-		'See also'
-		=> '建議參考',
-		'Legends:'
-		=> '图例:',
-		'Used Blocks'
-		=> '已用块',
-		'Free Blocks'
-		=> '未用块',
-		'Total'
-		=> '总共',
-		'Caches'
-		=> '快取',
-		'php Cached'
-		=> '快取的 PHP 指令',
-		'php Deleted'
-		=> '待刪 PHP 指令',
-		'var Cached'
-		=> '快取的變數',
-		'var Deleted'
-		=> '待刪變數',
-		'Summary'
-		=> '簡要訊息',
-		'List PHP'
-		=> '列出PHP',
-		'List Var Data'
-		=> '列變數資料',
-		'XCache %s Administration'
-		=> 'XCache %s 管理頁面',
-		'Module Info'
-		=> '組元訊息',
-		'Remove Selected'
-		=> '移除所选',
-		'Editing Variable %s'
-		=> '正在编辑变量 %s',
-		'Set %s in config to enable'
-		=> '請在配置文件中設置 %s 啟用本功能',
-		'cache.cache'
-		=> '快取|',
-		'cache.slots'
-		=> '槽|Hash 槽個數，對應 php.ini 裡的設置',
-		'cache.size'
-		=> '大小|共享記憶體區大小，單位：位元',
-		'cache.avail'
-		=> '剩餘|可用記憶體，對應共享記憶體區的剩餘記憶體位元數',
-		'cache.used'
-		=> '已用|已用内存, 对应共享内存区的已用内存字节数',
-		'cache.blocksgraph'
-		=> '百分比图|條狀顯示可用記憶體的比例',
-		'cache.operations'
-		=> '操作按鈕|點擊按鈕清除對應共享記憶體區的資料',
-		'cache.status'
-		=> '狀態|狀態標記. 當共享內存區正在編譯 PHP 腳本時標記為 "編譯中". 當共享內存區暫停使用時標記為 "禁用"',
-		'cache.hits'
-		=> '命中|共享記憶體命中次數，命中=從該共享記憶體載入 PHP 或者變數',
-		'cache.hits_avg_h'
-		=> '命中/H|每小时命中次数. 只统计最后 24 小时',
-		'cache.hits_graph'
-		=> '24H 分布|24 小时命中分布图. 图表现是最后 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|垃圾回收的倒數計時',
-		'entry.id'
-		=> 'Id|',
-		'entry.name'
-		=> '項目名稱/檔案名稱|項目名稱或者檔案名稱',
-		'entry.hits'
-		=> '命中|該項目被命中的次數 (從共享記憶體區載入)',
-		'entry.size'
-		=> '大小|項目在共享記憶體裡佔用位元數',
-		'entry.refcount'
-		=> '引用數|項目依然被其他程序佔用的引用次數',
-		'entry.phprefcount'
-		=> '共享|與本項目相同 PHP 內容的个數',
-		'entry.file_size'
-		=> '源大小|原始檔案大小',
-		'entry.file_mtime'
-		=> '修改|原始檔案最後修改時間',
-		'entry.file_device'
-		=> 'dev|原始檔案所在設備ID',
-		'entry.file_inode'
-		=> 'ino|原始檔案的inode',
-		'entry.class_cnt'
-		=> '类|类个数',
-		'entry.function_cnt'
-		=> '函数|函数个数',
-		'entry.hash'
-		=> 'Hash|Hash',
-		'entry.atime'
-		=> '存取|最後存取該項目的時間',
-		'entry.ctime'
-		=> '建立|該項目被建立於共享內的時間',
-		'entry.delete'
-		=> '移除|該項目被移除於共享內的時間',
-		'entry.remove'
-		=> '移除|',
-);
-
Index: /trunk/htdocs/common/common.php
===================================================================
--- /trunk/htdocs/common/common.php	(revision 1090)
+++ /trunk/htdocs/common/common.php	(revision 1099)
@@ -86,5 +86,5 @@
 }
 
-function get_language_file_ex($name, $lang)
+function get_language_file_ex($dir, $lang)
 {
 	static $langMap = array(
@@ -101,5 +101,5 @@
 	}
 
-	$file = "$name-$lang.lang.php";
+	$file = "$dir/$lang.php";
 	if (file_exists($file)) {
 		return $file;
@@ -108,13 +108,13 @@
 }
 
-function get_language_file($name)
+function get_language_file($dir)
 {
 	global $config;
 	if (!empty($config['lang'])) {
 		$lang = strtolower($config['lang']);
-		$file = get_language_file_ex($name, $lang);
+		$file = get_language_file_ex($dir, $lang);
 		if (!isset($file)) {
 			$lang = strtok($lang, ':-');
-			$file = get_language_file_ex($name, $lang);
+			$file = get_language_file_ex($dir, $lang);
 		}
 	}
@@ -125,5 +125,5 @@
 			foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $lang) {
 				$lang = strtok($lang, ':;');
-				$file = get_language_file_ex($name, $lang);
+				$file = get_language_file_ex($dir, $lang);
 				if (isset($file)) {
 					$config['lang'] = $lang;
@@ -131,5 +131,5 @@
 				}
 				if (strpos($lang, '-') !== false) {
-					$file = get_language_file_ex($name, strtok($lang, ':-'));
+					$file = get_language_file_ex($dir, strtok($lang, ':-'));
 					if (isset($file)) {
 						$config['lang'] = $lang;
@@ -140,5 +140,5 @@
 		}
 	}
-	return isset($file) ? $file : "$name-en.lang.php";
+	return isset($file) ? $file : "$dir/en.php";
 }
 
@@ -261,5 +261,5 @@
 
 $strings = array();
-include get_language_file("../common/common");
+include get_language_file("../common/lang");
 
 $modules = array();
Index: /trunk/htdocs/common/lang/zh-traditional.php
===================================================================
--- /trunk/htdocs/common/lang/zh-traditional.php	(revision 1099)
+++ /trunk/htdocs/common/lang/zh-traditional.php	(revision 1099)
@@ -0,0 +1,21 @@
+<?php
+
+$strings += array(
+		'Cacher'
+		=> '快取器',
+		'Coverager'
+		=> '代码覆盖查看器',
+		'Diagnosis'
+		=> '診斷',
+		'Document'
+		=> '幫助文檔',
+		'INI Reference'
+		=> 'INI 參考',
+		'Get Support'
+		=> '獲取支持',
+		'Discusson'
+		=> '討論',
+		''
+		=> '',
+		);
+
Index: /trunk/htdocs/common/lang/en.php
===================================================================
--- /trunk/htdocs/common/lang/en.php	(revision 1099)
+++ /trunk/htdocs/common/lang/en.php	(revision 1099)
@@ -0,0 +1,4 @@
+<?php
+
+$strings = array();
+
Index: /trunk/htdocs/common/lang/zh-simplified.php
===================================================================
--- /trunk/htdocs/common/lang/zh-simplified.php	(revision 1099)
+++ /trunk/htdocs/common/lang/zh-simplified.php	(revision 1099)
@@ -0,0 +1,21 @@
+<?php
+
+$strings += array(
+		'Cacher'
+		=> '缓存器',
+		'Coverager'
+		=> '代码覆盖查看器',
+		'Diagnosis'
+		=> '诊断',
+		'Document'
+		=> '帮助文档',
+		'INI Reference'
+		=> 'INI 参考',
+		'Get Support'
+		=> '获取支持',
+		'Discusson'
+		=> '讨论',
+		''
+		=> '',
+		);
+
Index: /unk/htdocs/common/common-en.lang.php
===================================================================
--- /trunk/htdocs/common/common-en.lang.php	(revision 1053)
+++ 	(revision )
@@ -1,4 +1,0 @@
-<?php
-
-$strings = array();
-
Index: /unk/htdocs/common/common-zh-simplified.lang.php
===================================================================
--- /trunk/htdocs/common/common-zh-simplified.lang.php	(revision 1089)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?php
-
-$strings += array(
-		'Cacher'
-		=> '缓存器',
-		'Coverager'
-		=> '代码覆盖查看器',
-		'Diagnosis'
-		=> '诊断',
-		'Document'
-		=> '帮助文档',
-		'INI Reference'
-		=> 'INI 参考',
-		'Get Support'
-		=> '获取支持',
-		'Discusson'
-		=> '讨论',
-		''
-		=> '',
-		);
-
Index: /unk/htdocs/common/common-zh-traditional.lang.php
===================================================================
--- /trunk/htdocs/common/common-zh-traditional.lang.php	(revision 1089)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?php
-
-$strings += array(
-		'Cacher'
-		=> '快取器',
-		'Coverager'
-		=> '代码覆盖查看器',
-		'Diagnosis'
-		=> '診斷',
-		'Document'
-		=> '幫助文檔',
-		'INI Reference'
-		=> 'INI 參考',
-		'Get Support'
-		=> '獲取支持',
-		'Discusson'
-		=> '討論',
-		''
-		=> '',
-		);
-
