mirror of
https://github.com/izzy2lost/dolphin.git
synced 2026-06-19 01:16:48 -07:00
Added some languages:
Added Norwegian Bokmål thanks to KHRZ Added Polish thanks to Baszta Added Russian thanks to Kein Also cleaned up the appearance of the GFX config dialog a bit, fixed a minor issue in the cmake build, and fixed the nowx build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6786 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
+2
-2
@@ -321,7 +321,7 @@ else()
|
||||
check_lib(CGGL CgGL Cg/cgGL.h)
|
||||
endif()
|
||||
|
||||
if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
|
||||
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
include_directories(Externals/CLRun/include)
|
||||
add_subdirectory(Externals/CLRun)
|
||||
endif()
|
||||
@@ -375,7 +375,7 @@ if(GETTEXT_FOUND AND NOT DISABLE_WX)
|
||||
file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/*.po)
|
||||
GETTEXT_CREATE_TRANSLATIONS(Languages/dolphin-emu.pot ALL ${LINGUAS})
|
||||
endif()
|
||||
if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
|
||||
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
install(FILES Data/license.txt DESTINATION ${datadir})
|
||||
endif()
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+316
-186
File diff suppressed because it is too large
Load Diff
+127
-106
File diff suppressed because it is too large
Load Diff
+127
-106
File diff suppressed because it is too large
Load Diff
+3329
File diff suppressed because it is too large
Load Diff
+127
-106
File diff suppressed because it is too large
Load Diff
+128
-106
File diff suppressed because it is too large
Load Diff
+3323
File diff suppressed because it is too large
Load Diff
+3305
File diff suppressed because it is too large
Load Diff
+3244
File diff suppressed because it is too large
Load Diff
@@ -263,8 +263,11 @@ void CConfigMain::InitializeGUILists()
|
||||
arrayStringFor_InterfaceLang.Add(_("English"));
|
||||
arrayStringFor_InterfaceLang.Add(_("German"));
|
||||
arrayStringFor_InterfaceLang.Add(_("French"));
|
||||
arrayStringFor_InterfaceLang.Add(_("Spanish"));
|
||||
arrayStringFor_InterfaceLang.Add(_("Italian"));
|
||||
|
||||
arrayStringFor_InterfaceLang.Add(_("Norwegian Bokmål"));
|
||||
arrayStringFor_InterfaceLang.Add(_("Polish"));
|
||||
arrayStringFor_InterfaceLang.Add(_("Russian"));
|
||||
}
|
||||
|
||||
void CConfigMain::InitializeGUIValues()
|
||||
|
||||
@@ -409,7 +409,7 @@ void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event))
|
||||
|
||||
void DolphinApp::InitLanguageSupport()
|
||||
{
|
||||
int language = 0;
|
||||
unsigned int language = 0;
|
||||
|
||||
// keep those in sync with CConfigMain::InitializeGUILists
|
||||
const wxLanguage langIds[] =
|
||||
@@ -418,9 +418,12 @@ void DolphinApp::InitLanguageSupport()
|
||||
wxLANGUAGE_ENGLISH,
|
||||
wxLANGUAGE_GERMAN,
|
||||
wxLANGUAGE_FRENCH,
|
||||
wxLANGUAGE_SPANISH,
|
||||
wxLANGUAGE_ITALIAN,
|
||||
wxLANGUAGE_NORWEGIAN_BOKMAL,
|
||||
wxLANGUAGE_POLISH,
|
||||
wxLANGUAGE_RUSSIAN
|
||||
};
|
||||
|
||||
IniFile ini;
|
||||
ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
|
||||
ini.Get("Interface", "Language", &language, 0);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user