Merge pull request #1373 from raven02/master

Several fix to CN/TW ini and UI language button
This commit is contained in:
Henrik Rydgård 2013-04-20 05:51:11 -07:00
commit 8a042befbd
3 changed files with 13 additions and 9 deletions

View File

@ -685,7 +685,7 @@ void SystemScreen::render() {
UICheckBox(GEN_ID, x, y += stride, s->T("Show Debug Statistics"), ALIGN_TOPLEFT, &g_Config.bShowDebugStats);
UICheckBox(GEN_ID, x, y += stride, s->T("Show FPS"), ALIGN_TOPLEFT, &g_Config.bShowFPSCounter);
VGrid vlang(530, 100, dp_yres - 50, 10, 10);
VGrid vlang(500, 100, dp_yres - 50, 10, 10);
for (size_t i = 0; i < langs_.size(); i++) {
std::string code;
@ -697,7 +697,7 @@ void SystemScreen::render() {
if (!code.empty())
buttonTitle = code;
if (UIButton(GEN_ID_LOOP(i), vlang, LARGE_BUTTON_WIDTH, 0, buttonTitle.c_str(), ALIGN_TOPLEFT)) {
if (UIButton(GEN_ID_LOOP(i), vlang, LARGE_BUTTON_WIDTH - 40, 0, buttonTitle.c_str(), ALIGN_TOPLEFT)) {
std::string oldLang = g_Config.languageIni;
g_Config.languageIni = code;
if (i18nrepo.LoadIni(g_Config.languageIni)) {

View File

@ -1,4 +1,4 @@
[MainMenu]
[MainMenu]
Credits = 开发人员
Exit = 退出
Load = 载入...
@ -49,10 +49,10 @@ Media Engine = 媒体引擎
Mipmapping = 多级纹理映射 (MipMap)
Stream VBO = 流式顶点缓冲对象 (Stream VBO)
Vertex Cache = 顶点缓存
Stretch to Display = 伸显示
Stretch to Display = 伸显示
[Pause]
Save State = 状态保存
Load State = 状态载入
Save State = 即时保存
Load State = 即时载入
Continue = 继续
Settings = 设置
Back to Menu = 返回菜单

View File

@ -5,6 +5,7 @@ Load = 載入...
Settings = 設置
Recent = 最近
[Developer]
Developer Tools = 開發工具
Dump frame to log = 轉儲日誌
Load language ini = 載入語言設定
Run CPU tests = 運行CPU測試
@ -36,6 +37,8 @@ Enable Sound = 開啟聲音
Controls Settings = 控制設置
OnScreen = 觸屏控制
Tilt = 重力感應 (水平模式)
Large Controls = 大按鈕
Show Analog Stick = 顯示摇杆
[Graphics]
2X = 2倍渲染分辨率
Buffered Rendering = 緩衝渲染
@ -44,12 +47,13 @@ Graphics Settings = 圖形設置
Hardware Transform = 硬件轉換
Linear Filtering = 線性過濾
Media Engine = 媒體引擎
Mipmapping = Mip貼圖
Mipmapping = MipMap貼圖
Stream VBO = 頂點緩衝對像
Vertex Cache = 頂點緩存
Stretch to Display = 延伸顯示
[Pause]
Save State = 狀態保存
Load State = 狀態載入
Save State = 即時保存
Load State = 即時載入
Continue = 繼續
Settings = 設定
Back to Menu = 返回菜單