suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeCAD/FreeCAD

Browse Source
This commit is contained in:
Yorik van Havre 2015-09-02 13:41:32 -03:00
commit a90fd14fe7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Base/CMakeLists.txt
View File

@ -48,10 +48,17 @@ else(MSVC)
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
)
endif(MSVC)
# needed for OpenSUSE
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(FreeCADBase_LIBS
${FreeCADBase_LIBS}
-lutil -lutil
-ldl -ldl
) )
endif(MSVC) endif()
generate_from_xml(BaseClassPy) generate_from_xml(BaseClassPy)
generate_from_xml(BoundBoxPy) generate_from_xml(BoundBoxPy)

2
src/Gui/Language/Translator.cpp
View File

@ -136,7 +136,7 @@ Translator::Translator()
d->mapLanguageTopLevelDomain[QT_TR_NOOP("Japanese" )] = "ja"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Japanese" )] = "ja";
d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese Simplified" )] = "zh-CN"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese Simplified" )] = "zh-CN";
d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese Traditional" )] = "zh-TW"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese Traditional" )] = "zh-TW";
d->mapLanguageTopLevelDomain[QT_TR_NOOP("Korean" )] = "kr"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Korean" )] = "ko";
d->mapLanguageTopLevelDomain[QT_TR_NOOP("Russian" )] = "ru"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Russian" )] = "ru";
d->mapLanguageTopLevelDomain[QT_TR_NOOP("Swedish" )] = "sv-SE"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Swedish" )] = "sv-SE";
d->mapLanguageTopLevelDomain[QT_TR_NOOP("Afrikaans" )] = "af"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Afrikaans" )] = "af";