[7458] | 1 | diff -uNr xbmc-12.0.orig/xbmc/settings/GUISettings.cpp xbmc-12.0/xbmc/settings/GUISettings.cpp |
---|
| 2 | --- xbmc-12.0.orig/xbmc/settings/GUISettings.cpp 2013-01-29 23:20:27.000000000 +0900 |
---|
| 3 | +++ xbmc-12.0/xbmc/settings/GUISettings.cpp 2013-02-10 09:26:00.805133453 +0900 |
---|
| 4 | @@ -875,7 +875,7 @@ |
---|
| 5 | AddString(laf, "lookandfeel.skinsettings", 21417, "", BUTTON_CONTROL_STANDARD); |
---|
| 6 | AddString(laf, "lookandfeel.skintheme",15111,"SKINDEFAULT", SPIN_CONTROL_TEXT); |
---|
| 7 | AddString(laf, "lookandfeel.skincolors",14078, "SKINDEFAULT", SPIN_CONTROL_TEXT); |
---|
| 8 | - AddString(laf, "lookandfeel.font",13303,"Default", SPIN_CONTROL_TEXT); |
---|
| 9 | + AddString(laf, "lookandfeel.font",13303,"Arial", SPIN_CONTROL_TEXT); |
---|
| 10 | AddInt(laf, "lookandfeel.skinzoom",20109, 0, -20, 2, 20, SPIN_CONTROL_INT, MASK_PERCENT); |
---|
| 11 | AddInt(laf, "lookandfeel.startupwindow",512,1, WINDOW_HOME, 1, WINDOW_PYTHON_END, SPIN_CONTROL_TEXT); |
---|
| 12 | AddString(laf, "lookandfeel.soundskin",15108,"SKINDEFAULT", SPIN_CONTROL_TEXT); |
---|
| 13 | @@ -884,8 +884,8 @@ |
---|
| 14 | AddString(laf, "lookandfeel.rssedit", 21450, "", BUTTON_CONTROL_STANDARD); |
---|
| 15 | |
---|
| 16 | CSettingsCategory* loc = AddCategory(SETTINGS_APPEARANCE, "locale", 14090); |
---|
| 17 | - AddString(loc, "locale.language",248,"English", SPIN_CONTROL_TEXT); |
---|
| 18 | - AddString(loc, "locale.country", 20026, "USA (12h)", SPIN_CONTROL_TEXT); |
---|
| 19 | + AddString(loc, "locale.language",248,"Japanese", SPIN_CONTROL_TEXT); |
---|
| 20 | + AddString(loc, "locale.country", 20026, "Japan", SPIN_CONTROL_TEXT); |
---|
| 21 | AddString(loc, "locale.charset", 14091, "DEFAULT", SPIN_CONTROL_TEXT); // charset is set by the language file |
---|
| 22 | |
---|
| 23 | bool use_timezone = false; |
---|
| 24 | @@ -901,8 +901,8 @@ |
---|
| 25 | if (use_timezone) |
---|
| 26 | { |
---|
| 27 | AddSeparator(loc, "locale.sep1"); |
---|
| 28 | - AddString(loc, "locale.timezonecountry", 14079, g_timezone.GetCountryByTimezone(g_timezone.GetOSConfiguredTimezone()), SPIN_CONTROL_TEXT); |
---|
| 29 | - AddString(loc, "locale.timezone", 14080, g_timezone.GetOSConfiguredTimezone(), SPIN_CONTROL_TEXT); |
---|
| 30 | + AddString(loc, "locale.timezonecountry", 14079, "Japan", SPIN_CONTROL_TEXT); |
---|
| 31 | + AddString(loc, "locale.timezone", 14080, "Asia/Tokyo", SPIN_CONTROL_TEXT); |
---|
| 32 | } |
---|
| 33 | #endif |
---|
| 34 | #ifdef HAS_TIME_SERVER |
---|