From 49dfb24267f4a8f04b7b6869c7db76553d690f27 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 2 Sep 2015 18:06:14 +0200 Subject: [PATCH 1/2] + Fix suffix for Korean --- src/Gui/Language/Translator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Gui/Language/Translator.cpp b/src/Gui/Language/Translator.cpp index 17bd01e1e..101701eb3 100644 --- a/src/Gui/Language/Translator.cpp +++ b/src/Gui/Language/Translator.cpp @@ -136,7 +136,7 @@ Translator::Translator() d->mapLanguageTopLevelDomain[QT_TR_NOOP("Japanese" )] = "ja"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Chinese Simplified" )] = "zh-CN"; 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("Swedish" )] = "sv-SE"; d->mapLanguageTopLevelDomain[QT_TR_NOOP("Afrikaans" )] = "af"; From e461f65552cb96fa9914cd737cbe274ea4d49637 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 2 Sep 2015 18:06:37 +0200 Subject: [PATCH 2/2] + fix build for FreeBSD --- src/Base/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 9a25275ab..b93079e67 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -48,10 +48,17 @@ else(MSVC) ${QT_QTCORE_LIBRARY} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} + ) +endif(MSVC) + +# needed for OpenSUSE +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(FreeCADBase_LIBS + ${FreeCADBase_LIBS} -lutil -ldl ) -endif(MSVC) +endif() generate_from_xml(BaseClassPy) generate_from_xml(BoundBoxPy)